Remove legacy Event fields