Small scripts cleanup