Nuke more non-query functions.