Cleaning up ivf-related code.

Change-Id: I80f3e197562f3424acddbff786a5d0d209fbd666
2 files changed