source structure cleanup