A bit more cleanup of the repository