functional: clean up after waldon
Merge pull request #680 from bcwaldon/fix-functional

functional: clean up after waldon