Since query isn't used or part of the interface none of this is either, lets remove.