minor clean-up, bring back derivatives