removed some commented section