Cleanup dependency.
Merge pull request #4424 from ianna/hcal-const-dependencies

Cleanup Dependency