minor naming tweaks, remove useless rm -rf