Remove more non-query functions and mark functions that need work.