[Confluence] cleanup

- get rid of some log warning due to invalid includes.
- remove deprecated code