Architecture cleaning (6/48)

Architecture cleaning