Clean up. Fixes to delete on phone which stopped functioning after edits
for tablet.