Minimal changes to allow for CMSMS 2.x compatiblity<br />Minor code cleanup.