Removed membership TODO