Removal of archaic $Id tags, partial tree cleanup and partial rebranding.