Same comment here as above: can we just remove?