Removed all SafeDelete logic