DF-5312 cleaned-up Profiler code;