Clean up genserver.js