Got rid of some commented out code