[Confluence] cleanup

mostly cosmetics and remove some unused stuff.