Cleanup of objectId search