nozomi: proprietary cleanup