Never seem to take AWAY any todos, only add....

framework/ActiveSync/doc/Horde/ActiveSync/TODO

@@ -55,4 +55,11 @@ BC BREAKING (i.e., Horde 6).
   that contains the pertinent information.
 
 - Maintain the serverid -> backendid map in a single place and stop storing
-  backend ids (i.e., IMAP folder names) in collection/state/folder cache etc...
+  backend ids (i.e., IMAP folder names) in collection/state/folder cache etc...
+
+- Possibly move the syncCache and state into the device object so we have a
+  single object to pass around that has access to all.
+
+- Extract a basic Horde_ActiveSync_Storage class? At the very least we need to
+  rename the current Horde_ActiveSync_State_* classes to Horde_ActiveSync_Storage
+  since they now deal with more that device state.