Streamlined wranglers.

Removed remaining class variables.