remove depedency on legacy router functions