Remove unused (I think) messages