Fix dispatcher code not cleaning after itself