server.js cleanup