Consolidate syntax, and don't remove if not Event.