Remove old, unused code.
Shuffle fillers around like kings at (red et al) weddings.