removed extra commented code