Remove backward compatibility.