Bug 24735: Remove QueryParser-related code