fix web.xml conflicts, remove provider annotation