removed some commented lines