Increased granularity for Delete funtionality

Early 2021 clean-up: duplicate