Improved logic in remove_deleted block to do simple compare against layer names for delete but also check if workspace/store don't correspond and delete