Clean up unneeded bits
Add Classic members search strategy