Stop pillows before migrate

The first commit is just cleanup