Cleanup for CI