Script: more clean up