Disable distance tracking when not using models. More refactoring.