Remove deprecated finalizer code