cleanups from S3Search removal