Cleaning up import