Fix migration order, cleanup self_and_desc. use