removed some commented parts