RF-13220: Remove dual-branding and references to AS 7. Also clean up errors reported by QS tools