Further cleanup of trackupstream filter