Clean up imports and exports