Making cleanup work.