More scripts cleanup