Event and subscriber cleanup