Cleaning up imports and missing code in ouimeaux