a little derivation cleanup