Removed some unwanted code and commented out code.