We'll go ahead and remove that completely; #26