Architecture cleaning (10/48)

Architecture cleaning