Removed some unnecessary commented-out code chunks