Architecture cleaning (47/48)

Architecture cleaning