Remove old backward compatibility code