App.js cleanup