DeveloperInfoServlet changes, some cleanup