Architecture cleaning (42/48)

Architecture cleaning