--- a/client/src/actions/notesActions.js	Tue Jun 20 19:04:42 2017 +0200
+++ b/client/src/actions/notesActions.js	Tue Jun 20 19:05:01 2017 +0200
@@ -17,10 +17,3 @@
     }
   };
 }
-
-export const loadNotesBySession = (session) => {
-  return {
-    type: types.LOAD_NOTES_BY_SESSION,
-    session: session
-  }
-}

--- a/client/src/actions/sessionsActions.js	Tue Jun 20 19:04:42 2017 +0200
+++ b/client/src/actions/sessionsActions.js	Tue Jun 20 19:05:01 2017 +0200
@@ -23,8 +23,8 @@
           method: 'POST',
           data: newSession
         },
-        commit: { type: types.CREATE_SESSION_ASYNC },
-        rollback: { type: 'NoOp'}
+        commit: { type: types.NOOP },
+        rollback: { type: types.NOOP }
       }
     }
   };

--- a/client/src/components/Settings.js	Tue Jun 20 19:04:42 2017 +0200
+++ b/client/src/components/Settings.js	Tue Jun 20 19:05:01 2017 +0200
@@ -58,7 +58,7 @@
 
 function mapStateToProps(state, props) {
   return {
-    currentUser: state.get('currentUser'),
+    currentUser: state['currentUser'],
   };
 }
 

--- a/client/src/constants/actionTypes.js	Tue Jun 20 19:04:42 2017 +0200
+++ b/client/src/constants/actionTypes.js	Tue Jun 20 19:05:01 2017 +0200
@@ -1,14 +1,10 @@
+export const NOOP = 'NOOP';
+
 export const ADD_NOTE = 'ADD_NOTE';
-export const ADD_NOTE_ASYNC = 'ADD_NOTE_ASYNC';
-export const LOAD_NOTES_BY_SESSION = 'LOAD_NOTES_BY_SESSION';
-export const LOAD_NOTES_BY_SESSION_ASYNC = 'LOAD_NOTES_BY_SESSION_ASYNC';
 
 export const CREATE_SESSION = 'CREATE_SESSION';
-export const CREATE_SESSION_ASYNC = 'CREATE_SESSION_ASYNC';
 export const UPDATE_SESSION = 'UPDATE_SESSION';
-export const UPDATE_SESSION_ASYNC = 'UPDATE_SESSION_ASYNC';
 export const LOAD_SESSIONS = 'LOAD_SESSIONS';
-export const LOAD_SESSIONS_ASYNC = 'LOAD_SESSIONS_ASYNC';
 
 export const AUTH_LOGIN_SUBMIT = 'AUTH_LOGIN_SUBMIT';
 export const AUTH_LOGIN_REQUEST = 'AUTH_LOGIN_REQUEST';

--- a/client/src/reducers/notesReducer.js	Tue Jun 20 19:04:42 2017 +0200
+++ b/client/src/reducers/notesReducer.js	Tue Jun 20 19:05:01 2017 +0200
@@ -6,9 +6,6 @@
   switch (action.type) {
     case types.ADD_NOTE:
       return state.push(new NoteRecord(action.note));
-    case types.LOAD_NOTES_BY_SESSION:
-      //return action.notes;
-      return state;
     default:
       return state;
   }