diff --git a/impl/src/main/java/org/jboss/weld/servlet/StaticWeldProvider.java b/impl/src/main/java/org/jboss/weld/servlet/StaticWeldProvider.java
deleted file mode 100644
index 76fccdd01cf..00000000000
--- a/impl/src/main/java/org/jboss/weld/servlet/StaticWeldProvider.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012, Red Hat, Inc., and individual contributors
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jboss.weld.servlet;
-
-import javax.enterprise.inject.spi.CDI;
-import javax.enterprise.inject.spi.CDIProvider;
-
-import org.jboss.weld.SimpleCDI;
-import org.jboss.weld.manager.BeanManagerImpl;
-
-public class StaticWeldProvider implements CDIProvider {
-
-    private static class EnhancedCDI extends SimpleCDI {
-
-        @Override
-        protected BeanManagerImpl unsatisfiedBeanManager(String callerClassName) {
-            /*
-             * In certain scenarios we use flat deployment model (weld-se, weld-servlet). In that case
-             * we return the only BeanManager we have.
-             */
-            if (getContainer().beanDeploymentArchives().values().size() == 1) {
-                return getContainer().beanDeploymentArchives().values().iterator().next();
-            }
-            return super.unsatisfiedBeanManager(callerClassName);
-        }
-    }
-
-    @Override
-    public CDI<Object> getCDI() {
-        return new EnhancedCDI();
-    }
-}
diff --git a/impl/src/main/java/org/jboss/weld/servlet/package-info.java b/impl/src/main/java/org/jboss/weld/servlet/package-info.java
deleted file mode 100644
index 561d3d11ce3..00000000000
--- a/impl/src/main/java/org/jboss/weld/servlet/package-info.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2015, Red Hat, Inc. and/or its affiliates, and individual
- * contributors by the @authors tag. See the copyright.txt in the
- * distribution for a full listing of individual contributors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-@Vetoed
-package org.jboss.weld.servlet;
-import javax.enterprise.inject.Vetoed;
-