Commentaries clean up