HCOLL-94 refactoring no new functionality.