clean up default routing code