Additional cleanup work.