flake cleanup, should fix #269