Cleanup safety precautions

//Cleanup safety precautions