Merge "Remove 6 unused watchlist messages"