[Confluence] fix: remove invalid includes
[Confluence] fix: remove deprecated code
VampireAE fixes, mmm'kay
Merge pull request #2084 from ronie/confluence-cleanup

[Confluence] cleanup
Merge pull request #2061 from davilla/vamp-fixes

VampireAE fixes, mmm'kay
[vda] revert back to intel greenline which is better than goofy framedrops for all