removed FunctionData/VariableData classes