Merge "Cleaning up ivf-related code."