Remove excess imports