Revert "Added/modified some agency/route fields"

This reverts commit 0357eb9a317a4d17fb1491ce5fea8326ea632c88.