cleanup logic to have the KeyCLI properly go through the Key-Class