More CMS Javadoc, remove all code changes.