added stripping of device codes and marketing names