use the KeyModel a bit more. Make sure we delete public mode keys and remove them from the agent