Remove bigdecimal dependency