Merge "Clean up profiler options"