server.js file cleaned up