LVS cleanup for tracking code