Stopped safe_remove attempting to unlink dirs

Previously safe_remove would attempt to unlink a path
Before attempting to remove it if it was a dir

Now it checks for a dir before that step