Remove worker states and some cleanup.

1. Remove worker states.
2. Clean up various worker-related counts.

@dthain, @btovar