more structure cleanup