Simplify servlet-context.xml