Got rid of a bunch of stuff that wasn't needed