Removing deprecated class reference