Robert, is that your idea of a joke? (nw)

Revert "(MESS) excalibur : removed unused code (nw)"
Revert "(MESS) excalibur : more unused code (nw)"

This reverts commit 82e58068109f8932732da1cc80761f0ae62e7638.
This reverts commit 3b4803da9a482ffdcbb1394a3e2106b2b70d5f84.