deleted some commented lines