recommit with less server.js stuff