Reduce clean delay

Signed-off-by: Ross Allan <rallanpcl@gmail.com>
Experimental fix for #460, #462

Signed-off-by: Ross Allan <rallanpcl@gmail.com>