Cleanup repo part3