[David] remove repeated definitions of terms