Removed stuff in prep for new stuff :)