Remove Deprecated class and method