Remove Deprecated Class