Clean up unwanted code