Cleanups in the scripts