Major clean up on unused code from years ago but never removed.

If there is a need to recover it, the tags are already enough for this.