Remove factor and offset from diag requests - left up to clients.