Remove commented-out deprecated lines

@jrbl