Clean up imports in Conversion module