Remove undefined and redundant variable
Merge pull request #1837 from ojalehto/refactor/remove-undefined-and-redundant-variable

Remove undefined and redundant variable
Handle null numeric types