Migrate mubmle and clean up some stuff