cleaning migration process to avoid problems, update #2446