More fixes to munge scripts, removed unnecessary steps.