diff --git a/cdi-portable-extension/pom.xml b/cdi-portable-extension/pom.xml
index d1f5d6ade2..a1867e762c 100644
--- a/cdi-portable-extension/pom.xml
+++ b/cdi-portable-extension/pom.xml
@@ -174,24 +174,5 @@
                 </dependency>
             </dependencies>
         </profile>
-        <profile>
-            <!-- When built in OpenShift the 'openshift' profile will be used when invoking mvn. -->
-            <!-- Use this profile for any OpenShift specific customization your app will need. -->
-            <!-- By default that is to put the resulting archive into the 'deployments' folder. -->
-            <!-- http://maven.apache.org/guides/mini/guide-building-for-different-environments.html -->
-            <id>openshift</id>
-            <build>
-                <plugins>
-                    <plugin>
-                        <artifactId>maven-war-plugin</artifactId>
-                        <version>2.1.1</version>
-                        <configuration>
-                            <outputDirectory>deployments</outputDirectory>
-                            <warName>ROOT</warName>
-                        </configuration>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
     </profiles>
 </project>
diff --git a/cdi-portable-extension/src/main/java/org/jboss/as/quickstart/cdi/extension/CreatureExtension.java b/cdi-portable-extension/src/main/java/org/jboss/as/quickstart/cdi/extension/CreatureExtension.java
index 5faf26f424..14d74421d8 100644
--- a/cdi-portable-extension/src/main/java/org/jboss/as/quickstart/cdi/extension/CreatureExtension.java
+++ b/cdi-portable-extension/src/main/java/org/jboss/as/quickstart/cdi/extension/CreatureExtension.java
@@ -37,10 +37,10 @@
  * A simple CDI Portable Extension to "inject" values from XML into the instances of a bean.
  */
 public class CreatureExtension implements Extension {
-    private static Document document;
+    private final Document document;
     private final Logger log = Logger.getLogger(CreatureExtension.class.getName());
 
-    static {
+    public CreatureExtension() {
         try {
             InputStream creatureDefs = CreatureExtension.class.getClassLoader().getResourceAsStream("creatures.xml");
             DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();