Remove an unused class declaration.
Improve the variable sampling sub-system.
Register more state and sample variables.