Cleanup for release

latest commit 282672a66b
Martin O'Leary authored