Merge branch 'develop' into GH-2153/metrics-url

src/classes/Metrics.js

@@ -312,11 +312,6 @@ class Metrics {
 			// New parameter for Ghostery 8.5.3
 			// AB tests enabled?
 			this._buildQueryPair('ts', conf.enable_abtests ? '1' : '0');
-
-			if (conf.enable_abtests) {
-				// Hub Layout A/B test. Added in 8.5.3. GH-2097, GH-2100
-				metrics_url += this._buildQueryPair('t2', Metrics._getHubLayoutView().toString());
-			}
 		}
 
 		if (CAMPAIGN_METRICS.includes(type) || type === 'uninstall') {
@@ -326,13 +321,8 @@ class Metrics {
 				this._buildQueryPair('us', this.utm_source) +
 				// Marketing campaign (Former utm_campaign)
 				this._buildQueryPair('uc', this.utm_campaign);
-		} else if (type === 'broken_page' && this._brokenPageWatcher.on && type !== 'uninstall') {
-			metrics_url +=
-				// What triggered the broken page ping?
-				this._buildQueryPair('setup_path', this._brokenPageWatcher.triggerId.toString()) +
-				// How much time passed between the trigger and the page refresh / open in new tab?
-				this._buildQueryPair('setup_block', (Date.now() - this._brokenPageWatcher.triggerTime).toString());
 		}
+
 		return metrics_url;
 	}