Remove unused
Move getopt_rest to a library file.