Cleaning up some messages