Removed some commented stuff