Architecture cleaning (2/48)

Architecture cleaning