removed old, unused code and unused command line options