Merge "Remove unused message"