Delete useless classes and bring them in properties