Safely remove (40/41)

Safely remove