Remove backward compatibility