Removed unsafe features

Removed unsafe features