CHERKASY-102 removing unecessary BigDecimal step, and using default groovy conversion