Removing basicServlet from master