migration cleanup

Change-Id: I35a759971b689e52c66bf99779991023753a47ce