Old code removed, membership tests will come once we validate that the UI implementation is satisfied.