restructuring, cleanup