Remove dependency upon BetaFeatures extension

Change-Id: I21bb7d015c74784bb41e1a0402e74ec9458662aa