HCOLL-74  cleaned up interfaces