removed redundant fields from events model
some more cleanup for event fields and import