Correct arg parser + delete useless code.