Sender cleanup