Added remove_path="yes" to remove the whole path