Removed old OptionParser code.