Not as clean as we would have liked