[Cleanup] in app.js and navigate.js