Removing backward compatibility (no point).