Architecture cleaning (15/48)

Architecture cleaning