Cleanup code introduced by emscripten refactor
This merge request cleans up code that was refactored to resolve warnings from emscripten compiler
- addresses !9869 (comment 1326274)
- addresses !9869 (comment 1326276)
- addresses !9869 (comment 1326277)
This merge request cleans up code that was refactored to resolve warnings from emscripten compiler