Be even more conservative when cleaning up