undo the previous two commits since it is more complicated to kill location group here