cleanup server.js and more