Architecture cleaning (40/48)

Architecture cleaning