Cleanups for things going away from scripts