remove deprecated routes
refactor routes