Improved Notifications and Analytics Module cleaning