Don't skip cleanup