Remove remaining of_import. Continue package split.