diff --git a/releng/org.eclipse.tracecompass.target/baseline/tracecompass-baseline-7.1.0.target b/releng/org.eclipse.tracecompass.target/baseline/tracecompass-baseline-7.1.0.target
new file mode 100644
index 0000000000..0c4631fb46
--- /dev/null
+++ b/releng/org.eclipse.tracecompass.target/baseline/tracecompass-baseline-7.1.0.target
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?pde version="3.8"?><target name="tracecompass-baseline-7.1.0" sequenceNumber="1">
+<locations>
+<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.tracecompass.analysis.counters.core" version="0.0.0"/>
+<unit id="org.eclipse.tracecompass.analysis.counters.ui" version="0.0.0"/>
+<unit id="org.eclipse.tracecompass.analysis.graph.core" version="0.0.0"/>
+<unit id="org.eclipse.tracecompass.analysis.graph.ui" version="0.0.0"/>
+<unit id="org.eclipse.tracecompass.analysis.lami.core" version="0.0.0"/>
+<unit id="org.eclipse.tracecompass.analysis.lami.ui" version="0.0.0"/>
+<unit id="org.eclipse.tracecompass.analysis.os.linux.core" version="0.0.0"/>
+<unit id="org.eclipse.tracecompass.analysis.os.linux.ui" version="0.0.0"/>
+<unit id="org.eclipse.tracecompass.analysis.profiling.core" version="0.0.0"/>
+<unit id="org.eclipse.tracecompass.analysis.profiling.ui" version="0.0.0"/>
+<unit id="org.eclipse.tracecompass.analysis.timing.core" version="0.0.0"/>
+<unit id="org.eclipse.tracecompass.analysis.timing.ui" version="0.0.0"/>
+<unit id="org.eclipse.tracecompass.btf.core" version="0.0.0"/>
+<unit id="org.eclipse.tracecompass.btf.ui" version="0.0.0"/>
+<unit id="org.eclipse.tracecompass.common.core" version="0.0.0"/>
+<unit id="org.eclipse.tracecompass.ctf.core" version="0.0.0"/>
+<unit id="org.eclipse.tracecompass.ctf.parser" version="0.0.0"/>
+<unit id="org.eclipse.tracecompass.datastore.core" version="0.0.0"/>
+<unit id="org.eclipse.tracecompass.gdbtrace.core" version="0.0.0"/>
+<unit id="org.eclipse.tracecompass.gdbtrace.ui" version="0.0.0"/>
+<unit id="org.eclipse.tracecompass.jsontrace.core" version="0.0.0"/>
+<unit id="org.eclipse.tracecompass.lttng2.common.core" version="0.0.0"/>
+<unit id="org.eclipse.tracecompass.lttng2.control.core" version="0.0.0"/>
+<unit id="org.eclipse.tracecompass.lttng2.control.ui" version="0.0.0"/>
+<unit id="org.eclipse.tracecompass.lttng2.kernel.core" version="0.0.0"/>
+<unit id="org.eclipse.tracecompass.lttng2.kernel.ui" version="0.0.0"/>
+<unit id="org.eclipse.tracecompass.lttng2.ust.core" version="0.0.0"/>
+<unit id="org.eclipse.tracecompass.lttng2.ust.ui" version="0.0.0"/>
+<unit id="org.eclipse.tracecompass.pcap.core" version="0.0.0"/>
+<unit id="org.eclipse.tracecompass.segmentstore.core" version="0.0.0"/>
+<unit id="org.eclipse.tracecompass.statesystem.core" version="0.0.0"/>
+<unit id="org.eclipse.tracecompass.tmf.analysis.xml.core" version="0.0.0"/>
+<unit id="org.eclipse.tracecompass.tmf.analysis.xml.ui" version="0.0.0"/>
+<unit id="org.eclipse.tracecompass.tmf.chart.core" version="0.0.0"/>
+<unit id="org.eclipse.tracecompass.tmf.chart.ui" version="0.0.0"/>
+<unit id="org.eclipse.tracecompass.tmf.cli.core" version="0.0.0"/>
+<unit id="org.eclipse.tracecompass.tmf.core" version="0.0.0"/>
+<unit id="org.eclipse.tracecompass.tmf.ctf.core" version="0.0.0"/>
+<unit id="org.eclipse.tracecompass.tmf.filter.parser" version="0.0.0"/>
+<unit id="org.eclipse.tracecompass.tmf.pcap.core" version="0.0.0"/>
+<unit id="org.eclipse.tracecompass.tmf.pcap.ui" version="0.0.0"/>
+<unit id="org.eclipse.tracecompass.tmf.remote.core" version="0.0.0"/>
+<unit id="org.eclipse.tracecompass.tmf.remote.ui" version="0.0.0"/>
+<unit id="org.eclipse.tracecompass.tmf.ui" version="0.0.0"/>
+<repository location="http://download.eclipse.org/tracecompass/releases/7.1.0/repository/"/>
+</location>
+<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.core.runtime" version="0.0.0"/>
+<repository location="http://download.eclipse.org/releases/2021-09"/>
+</location>
+</locations>
+</target>
diff --git a/tmf/org.eclipse.tracecompass.tmf.core/.settings/.api_filters b/tmf/org.eclipse.tracecompass.tmf.core/.settings/.api_filters
deleted file mode 100644
index 29740edaf3..0000000000
--- a/tmf/org.eclipse.tracecompass.tmf.core/.settings/.api_filters
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<component id="org.eclipse.tracecompass.tmf.core" version="2">
-    <resource path="META-INF/MANIFEST.MF">
-        <filter comment="ICorePropertyCollection interface has default implementation for all methods." id="923795461">
-            <message_arguments>
-                <message_argument value="7.1.0"/>
-                <message_argument value="7.0.0"/>
-            </message_arguments>
-        </filter>
-    </resource>
-</component>