removed some commented out parts