Cleanup - remove unused search code