Cleanup split route feature, remove duplicate code