Fix removing imports from same package