HG-182 fix formatting and remove dev code