Dependency on cpp.classes removed from core.expressions
Clean up