Removing unwanted code and setup