git rm nonsense again