AB expiry

Enough of this indefinite AB testing already 

Fixes #1124