[Confluence] fix: remove invalid includes
[Confluence] fix: remove deprecated code
Merge pull request #2084 from ronie/confluence-cleanup

[Confluence] cleanup