Routine general code cleanup of Deprecates and Dead Code.