Remove S3Search from HMS & CR