post 999 cleaning updates to scripts

@zmyao88  please review and merge