unit deletion tweaks