Cleaning up imports