For ENG-4359, strip out a bunch of IV1 code that was in the way