Add new routes, remove old unneeded ones