Be a bit more aggressive about cleanup