Begun some cleanup work.