CON-1298 remove unused messages
CON-1298 CR fixes