Remove extraneous methods and commented out code