git 1 and cleanup