WP-628 More cleanup of membership code