removed old routing code