Cleanup edits essentially done.