Removed CommandLineClientRunner because it's not really needed.