Remove deprecated query router