Removed a bunch of older references.