fix notifications and events elimination