Envelope cleanup