Safely Remove is broken