Removed Query classes