Optimizing import and removing