migration, ex 3 and cleanup