WCP-361 : A couple cleanup steps