Team code and related function cleanup

- prior to tackling the polio reports code.

Signed-off-by: Thomas Wagner <twagner@ivlab.com>