Update destroy logic in client side [WIP]
#348
Draft
destroy logic in client side [WIP]
#348