Script clean-up