More polish and progress
Remove some routes we don't need