get rid of import of moved modules