removed unsafe remove