Path cleanup, part 1