Some fixes of imports and unused mostly.
Also, why did I touch maman 13?!