making some cleanups on scripts