HCOLL-74  cleaned up interfaces mainly in the external replication