Removing links to IndexTaskQueryParameters
Working through a lot of unit tests