removed some commented out stuff