Remove deleted count fields from context and query admins

Signed-off-by: Don Naegely <naegelyd@gmail.com>
Merge pull request #254 from cbmi/update-admin-fields

Remove deleted count fields from context and query admins