Utility scripts cleanup