Would love to get rid of this, but we can table that discussion for later