Deleted a lot of extra crap