Wip optracker optimization

Please review this OpTracker optimization changes.