Field cleanup, leaky messages