diff --git a/src/components/Router.jsx b/src/components/Router.jsx
index a33eb84..b6ea30f 100644
--- a/src/components/Router.jsx
+++ b/src/components/Router.jsx
@@ -11,16 +11,10 @@ history.listen(() => {
 })
 
 export default function Router() {
-  // let [team, setTeam] = useState([])
-  // let [users, setUsers] = useState([])
   let [memberProps, setMemberProps] = useState({})
   let [teamProps, setTeamProps] = useState({})
 
   let teamCallback = (teamId, users, teams) => {
-    // Remove this:
-    // setTeam(teamId)
-
-    // Leave:
     setTeamProps({
       url: config.api + '/team/' + teamId.id,
       team: teamId,
@@ -37,16 +31,10 @@ export default function Router() {
     })
   }
 
-  // <Route
-  //   exact
-  //   path="/team"
-  //   render={props => <Team teamProps={team} usersProps={users} userIdCallback={userIdCallback} {...props} />}
-  // />
-
   return (
     <ReactRouter history={history}>
       <Switch>
-        <Route exact path="/" render={props => <Home teamCallback={teamCallback} {...props} />} />
+        <Route exact path="/" render={() => <Home props={teamCallback} />} />
 
         <Route exact path="/team" render={() => <Team props={teamProps} />} />
 
diff --git a/src/views/Home.jsx b/src/views/Home.jsx
index d396bfc..2e76295 100644
--- a/src/views/Home.jsx
+++ b/src/views/Home.jsx
@@ -7,7 +7,7 @@ import TeamList from '../components/TeamList.jsx'
 import FilterForm from '../components/FilterForm.jsx'
 import './Home.scss'
 
-export default function Home(props) {
+export default function Home({ props }) {
   // MARK: State
   let [loading, setLoading] = useState(true)
   let [loadingUsers, setLoadingUsers] = useState(true)
@@ -57,7 +57,7 @@ export default function Home(props) {
   // MARK: Callbacks
 
   let selectTeam = selectedTeam => {
-    props.teamCallback(selectedTeam, users, teams)
+    props(selectedTeam, users, teams)
     history.push('/team')
   }