Remove some of the dependencies for HTF