Did some cleanup work prior to updating.