Update to clean up some obsolete info