removed all SafeDelete logic