Removed wire count checks, just count them all for now.

Removed useless database query fields.