Remove old message

Change-Id: I0e8b9ea7957f8495dc9713ac5db811f42dfb19fe
Merge "Remove old message"