Removed some of the pointless crap