Some cleanup after 5 months away.
Remove old inoperable test code.