Removed ReturnMapUtils and its tests.  Fixes #3573