Remove pointless intermediate messages