Remove routing controller deprecations - See #1785