Remove node type dependencies from Surface.