Issue #19291 Cleanup main.js