Architecture cleaning (41/48)

Architecture cleaning