code cleanup in system optimization tracker