Removed things I wasn't going to work on again