Safe mode removal