removed outdated features from events
minor refactoring