Cleaned up command line options, removed some unused ones.