Cleanup unwanted code