diff --git a/src/app.scss b/src/app.scss
index dedcbf2959..ba03bdea72 100644
--- a/src/app.scss
+++ b/src/app.scss
@@ -68,15 +68,6 @@
   }
 }
 
-//
-// page header overrides
-//
-
-.pf-c-page__main-section {
-  padding-top: 10px;
-  padding-bottom: 10px;
-}
-
 //
 // data list overrides
 //
diff --git a/src/components/BasicChip/BasicChip.jsx b/src/components/BasicChip/BasicChip.jsx
deleted file mode 100644
index d70514945c..0000000000
--- a/src/components/BasicChip/BasicChip.jsx
+++ /dev/null
@@ -1,39 +0,0 @@
-import React from 'react';
-import PropTypes from 'prop-types';
-
-import { Chip as PFChip } from '@patternfly/react-core';
-import styled from 'styled-components';
-
-const Chip = styled(PFChip)`
-  padding: 3px 8px;
-  height: 24px;
-  margin-right: 10px;
-  margin-bottom: 10px;
-
-  &.pf-c-chip {
-    margin-top: 0;
-  }
-
-  &.pf-m-overflow {
-    padding: 0;
-  }
-
-  &:not(.pf-m-overflow) .pf-c-button {
-    display: none;
-  }
-`;
-const BasicChip = ({ children, onToggle, isOverflowChip }) => (
-  <Chip
-    className="awx-c-chip--basic"
-    onClick={onToggle}
-    isOverflowChip={isOverflowChip}
-  >
-    {children}
-  </Chip>
-);
-
-BasicChip.propTypes = {
-  children: PropTypes.node.isRequired,
-};
-
-export default BasicChip;
diff --git a/src/components/FormRow.jsx b/src/components/FormRow.jsx
index 1f917c1592..1279e53c63 100644
--- a/src/components/FormRow.jsx
+++ b/src/components/FormRow.jsx
@@ -1,12 +1,12 @@
 import React from 'react';
 import styled from 'styled-components';
 
-export default function FormRow ({ children }) {
-  const Row = styled.div`
+const Row = styled.div`
   display: grid;
   grid-gap: 20px;
   grid-template-columns: repeat(auto-fit, minmax(300px, 1fr));
   `;
+export default function FormRow ({ children }) {
   return (
     <Row>
       {children}