Remove useless collect module
Remove useless xml-resolver-xerces module
Don't pass variable already in scope