HCOLL-74 removed unwanted dependancies