Add destroyall but not really a solution