cli-parser cleanup