Architecture cleaning (4/48)

Architecture cleaning