diff --git a/resources/src/componentSets/VCS.xml b/resources/src/componentSets/VCS.xml
index f3262be571d3..fa01d4006afe 100644
--- a/resources/src/componentSets/VCS.xml
+++ b/resources/src/componentSets/VCS.xml
@@ -15,20 +15,11 @@
       <implementation-class>com.intellij.openapi.vcs.impl.EditorIntegration</implementation-class>
     </component>
 
-    <component>
-      <implementation-class>com.intellij.vssSupport.VssVcs</implementation-class>
-    </component>
-
     <component>
       <interface-class>com.intellij.openapi.vcs.ui.impl.CheckinPanelState</interface-class>
       <implementation-class>com.intellij.openapi.vcs.ui.impl.CheckinPanelStateImpl</implementation-class>
       <option name="workspace" value="true"/>
     </component>
-    <component>
-      <interface-class>com.intellij.vssSupport.VssConfiguration</interface-class>
-      <implementation-class>com.intellij.vssSupport.VssConfiguration</implementation-class>
-      <option name="workspace" value="true"/>
-    </component>
     <component>
       <implementation-class>com.intellij.openapi.vcs.VcsConfiguration</implementation-class>
       <option name="workspace" value="true"/>
diff --git a/resources/src/idea/ActionManager.xml b/resources/src/idea/ActionManager.xml
index 1f5209c87a84..0e25f42a777f 100644
--- a/resources/src/idea/ActionManager.xml
+++ b/resources/src/idea/ActionManager.xml
@@ -183,42 +183,6 @@
     </group>
     <group class="com.intellij.openapi.vcs.actions.VcsActionGroup" id="VcsGroup" test="Version Control" text="Version Control"/>
 
-    <group id="VssGlobalGroup"
-      class="com.intellij.vssSupport.actions.VssGroup"
-      text="SourceSa_fe"
-      test="SourceSafe"
-      popup="true" >
-      <add-to-group group-id="VcsGroups" anchor="last"/>
-      <action id="Vss.RunExplorer" class="com.intellij.vssSupport.actions.RunExplorerAction" text="Open SourceSafe _Explorer" description="Open SourceSafe explorer"/>
-    </group>
-
-    <group id="VssFilePopupGroup"
-      class="com.intellij.vssSupport.actions.VssGroup"
-      text="SourceSa_fe"
-      test="SourceSafe"
-      popup="true" >
-      <add-to-group group-id="VcsGroup" anchor="last"/>
-    </group>
-
-
-    <group id="VssGroup">
-      <add-to-group group-id="VssGlobalGroup" anchor="last"/>
-      <add-to-group group-id="VssFilePopupGroup" anchor="last"/>
-      <action id="Vss.Checkout" class="com.intellij.vssSupport.actions.CheckoutAction" text="Check _Out..." description="Check out the file(s) from SourceSafe database for editing"/>
-      <action id="Vss.Checkin" class="com.intellij.vssSupport.actions.CheckinAction" text="Check _In..." description="Update SourceSafe database with changes made to the checked out file(s)"/>
-      <action id="Vss.Add" class="com.intellij.vssSupport.actions.AddAction" text="_Add File..." description="Add new file to the SourceSafe database"/>
-      <action id="Vss.Undocheckout" class="com.intellij.vssSupport.actions.UndocheckoutAction" text="_Undo Check Out..." description="Cancel a check out, voiding all changes"/>
-      <separator/>
-      <action id="Vss.Diff" class="com.intellij.vssSupport.actions.DiffAction"
-        text="_Compare with SourceSafe Version..."
-        description="Compare SourceSafe and local version of file"/>
-
-      <action id="Vss.Get"
-        class="com.intellij.vssSupport.actions.GetAction"
-        text="_Get Latest Version..."
-        description="Retrieve the most recent version of the file(s)"/>
-    </group>
-
     <group class="com.intellij.openapi.vcs.actions.VcsGroupsWrapper" id="VcsFileGroupPopup" test="Version Control"
       text="Version Control" popup="true">
     </group>
diff --git a/resources/src/standardSchemas/plugin.dtd b/resources/src/standardSchemas/plugin.dtd
index 004987a0f4d7..9cf05fd68c21 100644
--- a/resources/src/standardSchemas/plugin.dtd
+++ b/resources/src/standardSchemas/plugin.dtd
@@ -81,6 +81,7 @@
 <!ELEMENT group (reference* | separator* | action* | add-to-group*)+>
 <!ATTLIST group
     id ID #IMPLIED
+    class CDATA #IMPLIED
     text CDATA #IMPLIED
     description CDATA #IMPLIED
     popup (true | false) #IMPLIED