Fixed partial saf conversion.  Deleted unnecessary code.  Fixed comments