Remove unused instance variables. Avoid walkback when deploying if we don't have STS enabled.