removed redundant router dispatch