remove some commented out stuff