Cleanup - no syntax errors?