Can we get rid of this line?