Remove stopwatch calls