Revert "Revert "Remove threat move stuff""

This reverts commit f175853064278a6444337ee22f5054f576422353.