Remove discontinued APIs