More landau derivation cleanup