Refactoring some message names, get rid of unused messages