Remove context-query class
Remove deprecated query arg
Remove deprecated method