[DEL] XQuery, map:new (replaced with map:merge)
[MIN] Cleanups