Remove folder indirection