refactor routes and remove links