Moving imports to the right module, stripping some dead code.
revamp
2018-02-05, Edouard Tisserant