Made blanket changes to remove ExportInfo to support serialization of export information.