removing ClassData from the surface, refs #260