Removed features flagged around MW_SCAP_BETA

* Kept the ENV var and exports, since it might be useful later

Change-Id: I6b856b5c22d28957c74cba56c87d4bea99029a0a
Merge "Removed features flagged around MW_SCAP_BETA" into production