Search class removed