Not needed, proper clean in callback works now