more migration cleanup