case 3122 - Stripped ting-related functionality.
Merge branch 'case-3122' into artesis_clean