fix cleanup for flakes8