C3 mahmoud hashish #44 fix destroy

@marwa-mehanna @Dayna161193 @omar-kassem please review this branch to merged to master