Architecture cleaning (37/48)

Architecture cleaning