More cleaning up, this time to destr and msg.