Putting cleanup in the right place, too