using more git rm for cleanup