Cleaning up previous unwanted code