unnecessary commented lines removed