Architecture cleaning (48/48)

Architecture cleaning