Removed remaining remnants of this removed feature
Merge branch 'removed_answering_own'