Cleaning the repo, getting ready for a rewrite