Removed configuration classes that have been replaced.
Command-line handler bug fix.