Additional tweaks for removing broken scripts