docu and clean up