Housekeeping, bit of refactoring. Ensuring all scripts dispose of objects