Supervised user interstitial cleanup: Remove unused includes and an unused member.