PI AF Link is not included in PI 2018 but it would be good to be able to remove the link during an upgrade. (not possible today https://customers.osisoft.com/s/knowledgearticle?knowledgeArticleUrl=000027668).
Same for PIBatch which cannot be uninstalled even when not licensed for (recommended to disable service https://customers.osisoft.com/s/knowledgearticle?knowledgeArticleUrl=PIBatchsubsystemdoesntstartBatch)
