Script calling cleanups