diff --git a/package.json b/package.json
index 747d7dcf..ec6484c9 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@boomerang-io/carbon-addons-boomerang-react",
-  "version": "3.0.0-beta.3",
+  "version": "3.0.0-beta.4",
   "license": "Apache-2",
   "repository": {
     "type": "git",
diff --git a/src/index.js b/src/index.js
index ac1071af..fa39d085 100755
--- a/src/index.js
+++ b/src/index.js
@@ -1,4 +1,3 @@
-// Components
 export { default as AutoSuggest } from "./components/AutoSuggest";
 export { default as Avatar } from "./components/Avatar";
 export { default as BmrgHeader } from "./components/Header";
@@ -63,221 +62,3 @@ export { default as Toggle } from "./components/Toggle";
 export { default as TooltipHover } from "./components/TooltipHover";
 export { default as UIShell } from "./components/UIShell";
 export { default as UserRequests } from "./components/UserRequests";
-
-// Carbon exports
-export {
-  Accordion,
-  AccordionItem,
-  AspectRatio,
-  Breadcrumb,
-  BreadcrumbItem,
-  Button,
-  ButtonSet,
-  Checkbox,
-  ClassPrefix,
-  CodeSnippet,
-  //ComposedModal,
-  ModalHeader,
-  ModalBody,
-  ModalFooter,
-  ContentSwitcher,
-  Copy,
-  CopyButton,
-  DangerButton,
-  DataTable,
-  Table,
-  TableActionList,
-  TableBatchAction,
-  TableBatchActions,
-  TableBody,
-  TableCell,
-  TableContainer,
-  TableExpandHeader,
-  TableExpandRow,
-  TableExpandedRow,
-  TableHead,
-  TableHeader,
-  TableRow,
-  TableSelectAll,
-  TableSelectRow,
-  TableToolbar,
-  TableToolbarAction,
-  TableToolbarContent,
-  TableToolbarSearch,
-  TableToolbarMenu,
-  DatePicker,
-  DatePickerInput,
-  Dropdown,
-  //ErrorBoundary,
-  //ErrorBoundaryContext,
-  Filename,
-  FileUploader,
-  FileUploaderButton,
-  FileUploaderDropContainer,
-  FileUploaderItem,
-  FilterableMultiSelect,
-  Form,
-  FluidForm,
-  FormGroup,
-  FormItem,
-  FormLabel,
-  Grid,
-  Row,
-  Column,
-  ColumnHang,
-  FlexGrid,
-  InlineLoading,
-  Link,
-  ListItem,
-  //Modal,
-  ModalWrapper,
-  MultiSelect,
-  ActionableNotification,
-  //ToastNotification,
-  InlineNotification,
-  NotificationActionButton,
-  NotificationButton,
-  NumberInput,
-  OrderedList,
-  OverflowMenu,
-  OverflowMenuItem,
-  Pagination,
-  PaginationNav,
-  ControlledPasswordInput,
-  PasswordInput,
-  PrimaryButton,
-  ProgressIndicator,
-  ProgressStep,
-  RadioButton,
-  RadioButtonGroup,
-  Search,
-  SearchFilterButton,
-  SearchLayoutButton,
-  ExpandableSearch,
-  SecondaryButton,
-  Select,
-  SelectItem,
-  SelectItemGroup,
-  Switch,
-  Slider,
-  StructuredListWrapper,
-  StructuredListHead,
-  StructuredListBody,
-  StructuredListRow,
-  StructuredListInput,
-  StructuredListCell,
-  StructuredListSkeleton,
-  Tab,
-  TabContent,
-  Tabs,
-  Tag,
-  //TextArea,
-  //TextInput,
-  Tile,
-  ClickableTile,
-  SelectableTile,
-  ExpandableTile,
-  TileAboveTheFoldContent,
-  TileBelowTheFoldContent,
-  RadioTile,
-  TileGroup,
-  TimePicker,
-  TimePickerSelect,
-  //Toggle,
-  ToggletipLabel,
-  Toggletip,
-  ToggletipButton,
-  ToggletipContent,
-  ToggletipActions,
-  UnorderedList,
-  SkeletonText,
-  SkeletonPlaceholder,
-  SkeletonIcon,
-  DataTableSkeleton,
-  AccordionSkeleton,
-  BreadcrumbSkeleton,
-  ButtonSkeleton,
-  CheckboxSkeleton,
-  CodeSnippetSkeleton,
-  DropdownSkeleton,
-  FileUploaderSkeleton,
-  NumberInputSkeleton,
-  ProgressIndicatorSkeleton,
-  RadioButtonSkeleton,
-  SearchSkeleton,
-  SelectSkeleton,
-  SliderSkeleton,
-  TabsSkeleton,
-  TagSkeleton,
-  TextAreaSkeleton,
-  TextInputSkeleton,
-  ToggleSkeleton,
-  ToggleSmallSkeleton,
-  IconSkeleton,
-  DatePickerSkeleton,
-  Content,
-  Header,
-  HeaderContainer,
-  HeaderGlobalAction,
-  HeaderGlobalBar,
-  HeaderMenu,
-  HeaderMenuButton,
-  HeaderMenuItem,
-  HeaderName,
-  HeaderNavigation,
-  HeaderPanel,
-  HeaderSideNavItems,
-  Switcher,
-  SwitcherItem,
-  SwitcherDivider,
-  SkipToContent,
-  SideNav,
-  SideNavDetails,
-  SideNavDivider,
-  SideNavFooter,
-  SideNavHeader,
-  SideNavIcon,
-  SideNavItem,
-  SideNavItems,
-  SideNavLink,
-  SideNavLinkText,
-  SideNavMenu,
-  SideNavMenuItem,
-  SideNavSwitcher,
-  unstable_useContextMenu,
-  unstable_FeatureFlags,
-  unstable_useFeatureFlag,
-  unstable_useFeatureFlags,
-  Heading,
-  Section,
-  IconButton,
-  Layer,
-  useLayer,
-  unstable_Menu,
-  unstable_MenuDivider,
-  unstable_MenuGroup,
-  unstable_MenuItem,
-  unstable_MenuRadioGroup,
-  unstable_MenuSelectableItem,
-  unstable_OverflowMenuV2,
-  unstable_PageSelector,
-  unstable_Pagination,
-  Popover,
-  PopoverContent,
-  ProgressBar,
-  HStack,
-  Stack,
-  VStack,
-  Tooltip,
-  DefinitionTooltip,
-  TreeView,
-  TreeNode,
-  TabPanel,
-  TabPanels,
-  TabList,
-  IconTab,
-  GlobalTheme,
-  Theme,
-  useTheme,
-  usePrefix,
-} from "@carbon/react";