Optimize out more code which is only used on mysb.com
Merge branch 'public/7.8' into public/feature/no-slimservice

Change-Id: Id8f3d8a617cc7abb7923f1db679e35b79d4cb13a