Remove circular event reference