Removed direct references to CLASS internals.

12 files changed