Some cleanup work.