Merge "Cleanup modifyRoutes" into main