cleanups, looking into event clearing