Got rid of some commented out stuff