Cleaning up import statements