removed extra commented out code