removed extra lines of commented out code