squadron-hoylman migration cleanup/continuation