Remove Axis dependencies from CDS, compiles but won't work yet.