Location delete tweaks

commit by commit