Moving some messages, deleting dead code