Structural clean up