Architecture cleaning (39/48)

Architecture cleaning