Move away from streamlicensing