structure clean-up