Merge "Remove 2 unused search related messages"