Architecture cleaning (19/48)

Architecture cleaning