Updated support for legacy MAF files.  Removed (now) obsolete MAF classes