Removed all of the pointless shit we had