Misc cleanup. Removal of unused imports and code deduplication. Contributed by Benoit Wiart (b.wiart at ubik-inginierie.com) This closes #218 on github