Script cleanups