Remove cascade; better sync logic