Removed some commented code