Begin a cleanup process of getting rid of deprecated functionality.
Begin code cleanup... for singleton access
Minor notices and bug fixes.
Fixes for the upcoming CMSMS 2.3