NEXUS-5790: Cleanup

Removed unused stopwatch, and sanitized
constants.