Refactoring: removed references to NumJS