Remove Deprecated Code