Remove dead code.  Simplify key-error functionality.