Enable Queens, and set Queens as the smoke gate

Remove soon-to-be deprecated combos

Change-Id: I905aabc8d2168e87b6d341bac45a38991f26cc57