Removed all SafeDelete stuff