diff --git a/spring-bootstrap/src/test/java/org/springframework/bootstrap/context/embedded/AbstractEmbeddedServletContainerFactoryTests.java b/spring-bootstrap/src/test/java/org/springframework/bootstrap/context/embedded/AbstractEmbeddedServletContainerFactoryTests.java
index 5278e5b0a94..281bd228469 100644
--- a/spring-bootstrap/src/test/java/org/springframework/bootstrap/context/embedded/AbstractEmbeddedServletContainerFactoryTests.java
+++ b/spring-bootstrap/src/test/java/org/springframework/bootstrap/context/embedded/AbstractEmbeddedServletContainerFactoryTests.java
@@ -38,12 +38,6 @@ import org.junit.Test;
 import org.junit.rules.ExpectedException;
 import org.junit.rules.TemporaryFolder;
 import org.mockito.InOrder;
-import org.springframework.bootstrap.context.embedded.AbstractEmbeddedServletContainerFactory;
-import org.springframework.bootstrap.context.embedded.ConfigurableEmbeddedServletContainerFactory;
-import org.springframework.bootstrap.context.embedded.EmbeddedServletContainer;
-import org.springframework.bootstrap.context.embedded.FilterRegistrationBean;
-import org.springframework.bootstrap.context.embedded.ServletContextInitializer;
-import org.springframework.bootstrap.context.embedded.ServletRegistrationBean;
 import org.springframework.http.HttpMethod;
 import org.springframework.http.client.ClientHttpRequest;
 import org.springframework.http.client.ClientHttpResponse;
@@ -146,7 +140,6 @@ public abstract class AbstractEmbeddedServletContainerFactoryTests {
 
 	@Test
 	public void startBlocksUntilReadyToServe() throws Exception {
-		// FIXME Assume.group(TestGroup.LONG_RUNNING);
 		ConfigurableEmbeddedServletContainerFactory factory = getFactory();
 		final Date[] date = new Date[1];
 		this.container = factory
diff --git a/spring-package-maven-plugin/src/main/java/org/springframework/maven/packaging/ExecutableWarMojo.java b/spring-package-maven-plugin/src/main/java/org/springframework/maven/packaging/ExecutableWarMojo.java
index ae60ddb9e57..d4f3df19357 100644
--- a/spring-package-maven-plugin/src/main/java/org/springframework/maven/packaging/ExecutableWarMojo.java
+++ b/spring-package-maven-plugin/src/main/java/org/springframework/maven/packaging/ExecutableWarMojo.java
@@ -36,8 +36,6 @@ import org.apache.maven.plugins.annotations.ResolutionScope;
 @Mojo(name = "executable-war", defaultPhase = LifecyclePhase.PACKAGE, requiresProject = true, threadSafe = true, requiresDependencyResolution = ResolutionScope.COMPILE_PLUS_RUNTIME, requiresDependencyCollection = ResolutionScope.COMPILE_PLUS_RUNTIME)
 public class ExecutableWarMojo extends AbstractExecutableArchiveMojo {
 
-	// FIXME classes in the wrong place
-
 	private static final Map<String, String> SCOPE_DESTINATIONS;
 	static {
 		Map<String, String> map = new HashMap<String, String>();
diff --git a/spring-package-maven-plugin/src/main/java/org/springframework/maven/packaging/PropertiesMergingResourceTransformer.java b/spring-package-maven-plugin/src/main/java/org/springframework/maven/packaging/PropertiesMergingResourceTransformer.java
index 92c2dedfcbc..93c0a70c8f0 100644
--- a/spring-package-maven-plugin/src/main/java/org/springframework/maven/packaging/PropertiesMergingResourceTransformer.java
+++ b/spring-package-maven-plugin/src/main/java/org/springframework/maven/packaging/PropertiesMergingResourceTransformer.java
@@ -35,8 +35,6 @@ import org.apache.maven.plugins.shade.resource.ResourceTransformer;
  */
 public class PropertiesMergingResourceTransformer implements ResourceTransformer {
 
-	// FIXME move out of core
-
 	private String resource; // Set this in pom configuration with
 								// <resource>...</resource>