Fix default kernel cleanup issue