2.7 + repo clean up