System structure cleanup