DOC : various clean-ups