structure clean up