Merge "Removal of deprecated SNAPS-OO classes."