[CLEANUP] Profiler modifications for PR