Structural cleanup