Clean-up imports