Clean up Event creation