removing some commented out stuff