Some repo clean-up