removed extra commented parts