Cleanup overlay discussions
Merge pull request #676 from Tahi-project/overlay-discussion-cleanup

Cleanup overlay discussions