Architecture cleaning (16/48)

Architecture cleaning