Clean up import statements more generally