Add a destroy mechanism.
Remove old, unused test code.