Clean up salt raet routing logic in prep for unique naming versus roles