Move delete related mapping into yankring function and misc tweaks