More Path cleanup