spike: Begin cleaning up.
Merge in 'spike'.