Architecture cleaning (43/48)

Architecture cleaning