deleted stuff that i had commented out