KB-419 Remove stopWatch statements from code, so we can deploy this