be more stringent about deleting keys on remove all