Removed Todos in OIMap.h