2.4-rc1-script clean up phase 1