Delete not needed events, some refactoring