Tiny more cleanup to none-finder