KFSTP-1466 use cleanAmount in calculations to avoid NPEs