A little more cleanup

Laura A DeCicco requested to merge ffn into master Jun 29, 2017