Cleaning up unwanted code