Testing more removal of extraneous references.