More CMS Javadoc cleaning