Remove unnecessary servlet mappings.
Fix url() invocation to includeServletPath = false.