fix delete order errors

#### Reviewers
@jframos @flopezag

#### Description
FIX destroy method to keep data consistency 

#### Test
Tested locally