Removed some commeted out code