And can we get rid of this comment too?