Clean up Servlet.java
Remove generate-handler, clean up ring/jar