I guess the path vs dir cleanup will come in a followup PR?