Remove deprecated api keywords