Clean-up in docu