Merge "Remove hitcounters and associated code"