Clean up packages and server.js