Removed some commented out code and an unused variable