Smallfix track prod

pure technical changes to reduce dependencies

I'm afraid it is also a violation of our coding standards.