Final routing cleanup in data layer.