Cleanup for re-use.
Continued progress...