Removed alpha/beta words from the opt-in mechanism, as these seem to change too often
Remove unused beta switch
Replace beta class with alpha