Merge pull request #5049 from WoltLab/visit-track-cleanup