Further clean-up done to the repo