Removed some commented out code