Implement remove_key

Signed-off-by: Eugene Krasnikov <k.eugene.e@gmail.com>
Switch fixes

Signed-off-by: Eugene Krasnikov <k.eugene.e@gmail.com>