Removed some commented lines