Finish migrate phase 2