Iris Patch Spring Cleanup