FabriceSalvaire cleanup

05d6d58

May 20, 2017

cleanup

05d6d58