remove path_key references