removed some commented area