Clean up of TitleServlet