Spawn cleanup

Still ~230 spawn duplication errors left