Finish rework of bt_deletekey, w/bug fixes