Supervisor no longer hangs on to unnecessary objects