Remove hotswap

Lots of steps, but now it's all cleaned up. Three files completely removed, their functionality subsumed by others.