Changed event type to event category
Remove swap file