HCOLL-230 - removed trace code and unwanted methods