removing deprecation
fixing bug in diamond sum/product evaluation