@faishal If you agree as well on this, please carry on with moving any redundant checks ( IP / User exclusion ) to the `WP_Stream_Connectors` class.