Remove MyServlet and small changes.