Added Nigel's suggested code to clear all but the destroy callback early