Add legacy servlets, removing unnecessary request classes, optimize performance