Removed dead and commented out code, including choldate