UC-118 removing unused messages