Removing some junk

Might re-add some of this stuff back later but its in the way