Removed some unnecessary commented code