Architecture cleaning (3/48)

Architecture cleaning