Remove DiagStruct