Architecture cleaning (35/48)

Architecture cleaning