Begun cleaning up routing.