Remove deleted count fields from context and query admins

Signed-off-by: Don Naegely <naegelyd@gmail.com>