functional: clean up after jonboulle
Merge pull request #642 from bcwaldon/fix-functional

functional: clean up after jonboulle