diff --git a/parent/pom.xml b/parent/pom.xml
index bca5ca90..494c9e57 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -55,30 +55,24 @@
 		<!-- URL of latest JBT nightly staging composite site (all the componentsin once place) -->
 		<!-- for master/trunk use _composite_/trunk; for _41, use _composite_/4.1.kepler -->
 		<jbosstools-nightly-staging-composite>http://download.jboss.org/jbosstools/builds/staging/_composite_/core/trunk/</jbosstools-nightly-staging-composite>
-		<!-- this site is not enabled by default as SOA Tooling is a downstream project (sorta). -->
-		<jbosstools-nightly-staging-composite-soa-tooling>http://download.jboss.org/jbosstools/builds/staging/_composite_/soa-tooling/trunk/</jbosstools-nightly-staging-composite-soa-tooling>
-
-		<!-- URL of latest JBT SOA requirements composite mirror -->
-		<!-- TODO: JBIDE-11121 - remove this when we have a SOA TP site instead -->
-		<!-- TODO: don't forget to update this in ../aggregate/soa*/associate.properties too (2 files)! -->
-		<jboss-requirements-composite-soa-tooling-mirror>http://download.jboss.org/jbosstools/updates/kepler/integration-stack/</jboss-requirements-composite-soa-tooling-mirror>
 
 		<!-- published aggregate update sites go here, for consumption by QE and downstream JBDS builds -->
 		<jbosstools-nightly>http://download.jboss.org/jbosstools/updates/nightly/core/trunk/</jbosstools-nightly>
-		<!-- JBIDE-12974 
-			Trying to old coretests and soatests sites in favour of a site w/ integration tests AND unit tests on it 
-			Note: 4.1.kepler branch does not exist yet for coretests or for integrationtests so only need trunk URL
-		<jbosstools-nightly-tests>http://download.jboss.org/jbosstools/updates/nightly/coretests/trunk/</jbosstools-nightly-tests> 
-		-->
-		<jbosstools-nightly-tests>http://download.jboss.org/jbosstools/updates/nightly/integrationtests/trunk/</jbosstools-nightly-tests>
-		<!-- these sites are not enabled by default as SOA Tooling is a downstream project (sorta). -->
-		<jbosstools-nightly-soa-tooling>http://download.jboss.org/jbosstools/updates/nightly/soa-tooling/trunk/</jbosstools-nightly-soa-tooling>
-		<!-- JBIDE-12974 
-			Trying to old coretests and soatests sites in favour of a site w/ integration tests AND unit tests on it 
-			Note: 4.1.kepler branch does not exist yet for coretests or for integrationtests so only need trunk URL
+
+		<!-- JBIDE-12974, JBTIS-104, JBIDE-13790 Must switch back to using coretests as integrationtests site no longer includes o.j.t.test -->
+		<jbosstools-nightly-tests>http://download.jboss.org/jbosstools/updates/nightly/coretests/trunk/</jbosstools-nightly-tests>
+
+		<!-- TODO: remove this as no used anymore by JBTIS -->
+		<jbosstools-nightly-staging-composite-soa-tooling>http://download.jboss.org/jbosstools/builds/staging/_composite_/soa-tooling/trunk/</jbosstools-nightly-staging-composite-soa-tooling>
+
+		<!-- TODO: remove this as JBTIS doesn't use it? URL of latest JBT IS target platform -->
+		<jboss-requirements-composite-soa-tooling-mirror>http://download.jboss.org/jbosstools/targetplatforms/jbtistarget/kepler/</jboss-requirements-composite-soa-tooling-mirror>
+
+		<!-- TODO: remove this? These sites are not enabled by default as Integration Stack is a downstream project. -->
+		<jbosstools-nightly-soa-tooling>http://download.jboss.org/jbosstools/updates/nightly/integration-stack/4.1.kepler/</jbosstools-nightly-soa-tooling>
+
+		<!-- TODO: find out from pleacu, mmalina if this is still relevant or should just be removed entirely. -->
 		<jbosstools-nightly-soa-tooling-tests>http://download.jboss.org/jbosstools/updates/nightly/soatests/trunk/</jbosstools-nightly-soa-tooling-tests>
-		-->
-		<jbosstools-nightly-soa-tooling-tests>http://download.jboss.org/jbosstools/updates/nightly/integrationtests/trunk/</jbosstools-nightly-soa-tooling-tests>
 		
 		<!-- 5. extra requirements (for 3rd party "Extras" site) -->
 		<!-- TODO: shouln't those move to another (JBDS?) pom -->
@@ -102,7 +96,7 @@
 		<!-- default value for the "minimum" profile -->
 		<TARGET_PLATFORM_VERSION>4.30.5.Final</TARGET_PLATFORM_VERSION>
 		<!-- default value for the "maximum" profile -->
-		<TARGET_PLATFORM_VERSION_MAXIMUM>4.30.6.Alpha1-SNAPSHOT</TARGET_PLATFORM_VERSION_MAXIMUM>
+		<TARGET_PLATFORM_VERSION_MAXIMUM>4.31.1.Alpha1-SNAPSHOT</TARGET_PLATFORM_VERSION_MAXIMUM>
 
 		<!-- to build with the minimum TP, use -Punified.target (on by default); to build with the maximum TP, use -Pmaximum -->
 		<!-- when building/testing components, use minumum TP -->
@@ -475,6 +469,7 @@
 			</properties>
 		</profile>
 
+		<!-- TODO: remove this? Do JBTIS projects even use this? -->
 		<profile>
 			<id>jbosstools-nightly-staging-composite-soa-tooling</id>
 			<properties>