Cleanup prep for smarter routing algorithm