DATACASS-125 - WIP - Docbook Cleanup