Code clean up in the V2 techs