unify cleanup and always use it