Bootstrap migration continues: remove some duplication; remove some failures