Yes, this is really just some sort of safety net. If you think it's not
useful we can leave it as is.