structural cleanup