more script cleanup