dispose of tracks properly

Cherry picked Gary's fix for the track disposal issue so we could go ahead and get this out there.