removed extraneous commented out code