remove hard-coded backward compatibility