Well this is similar to what I was saying in Kristian's PR. We might as well take care of all of that cleanup at the same time.