Bug fixes to removeEventType method