Refactor Zuul cleanup

Change-Id: I83a73e31e73e685786476043199c3b442e9bf693
1 file changed