*: kill p6 spike/spirals difference

We're going with spirals for the production model, and the code fork
doesn't make much sense anyway, as it all ended up being the same (so
far). Whenever the behaviour between spiral/spikes changes, we should
just drop support for spikes.