Remove deprecated api