Code cleanup - eliminating references to HierarchyColumnReference

Change-Id: Icff819d83c556433e77d0d39c0f1f93239639397