Fixed remove_safe parameters.  may be empty