removed all the junk from setup...whoops