clean up, move to git