removed old membership class and related tests