Further clean up of repository