more restructuring
cleaning