Remove Context
Rename to_decimal => new