deleted some commented stuff