more cleanups
git rm  is sweet