removed some commented stuff