remove circular dependency on HTF