new servlets, code cleanup