cleanup/rebuild cont'd.