Smallfix track prod

pure technical changes to reduce dependencies