Clean up imports and extensions