Complete migration!!!
Todo: copy and remove a whole branch!