castor

Remove Adaptx from Castor; add new implementation of xmldiff for CTF