Remove deprecated CliHandler.