Remove deprecated argument API