More cleanup of measurement_params uuid checking