Initial repo clean up