Cleanup some unnecessary messages