Cleanup, flakeify