diff --git a/datapage.cpp b/datapage.cpp
index 5aaa531..19f4a97 100644
--- a/datapage.cpp
+++ b/datapage.cpp
@@ -323,7 +323,7 @@ bool DataPage::append(datatuple const * dat)
   return succ;
 }
 
-bool DataPage::recordRead(const typename datatuple::key_t key, size_t keySize,  datatuple ** buf)
+bool DataPage::recordRead(const datatuple::key_t key, size_t keySize,  datatuple ** buf)
 {
   iterator itr(this, NULL);
 
diff --git a/datapage.h b/datapage.h
index 2ed1672..1532b89 100644
--- a/datapage.h
+++ b/datapage.h
@@ -82,7 +82,7 @@ public:
   }
 
   bool append(datatuple const * dat);
-  bool recordRead(const typename datatuple::key_t key, size_t keySize,  datatuple ** buf);
+  bool recordRead(const  datatuple::key_t key, size_t keySize,  datatuple ** buf);
 
   inline uint16_t recordCount();
 
diff --git a/logstore.h b/logstore.h
index aef2898..58333c4 100644
--- a/logstore.h
+++ b/logstore.h
@@ -414,8 +414,8 @@ public:
       logtable * ltable;
       uint64_t epoch;
       typedef mergeManyIterator<
-        typename memTreeComponent::batchedRevalidatingIterator,
-        typename memTreeComponent::iterator> inner_merge_it_t;
+         memTreeComponent::batchedRevalidatingIterator,
+         memTreeComponent::iterator> inner_merge_it_t;
       typedef mergeManyIterator<
         inner_merge_it_t,
         diskTreeComponent::iterator> merge_it_t;
@@ -444,8 +444,8 @@ public:
 
 
       void validate() {
-        typename memTreeComponent::batchedRevalidatingIterator * c0_it;
-        typename memTreeComponent::iterator *c0_mergeable_it[1];
+         memTreeComponent::batchedRevalidatingIterator * c0_it;
+         memTreeComponent::iterator *c0_mergeable_it[1];
         diskTreeComponent::iterator * disk_it[4];
         epoch = ltable->get_epoch();
 
@@ -458,8 +458,8 @@ public:
           t = NULL;
         }
 
-        c0_it              = new typename memTreeComponent::batchedRevalidatingIterator(ltable->get_tree_c0(), 100, &ltable->rb_mut,  t);
-        c0_mergeable_it[0] = new typename memTreeComponent::iterator            (ltable->get_tree_c0_mergeable(),                            t);
+        c0_it              = new  memTreeComponent::batchedRevalidatingIterator(ltable->get_tree_c0(), 100, &ltable->rb_mut,  t);
+        c0_mergeable_it[0] = new  memTreeComponent::iterator            (ltable->get_tree_c0_mergeable(),                            t);
         if(ltable->get_tree_c1_prime()) {
           disk_it[0] = ltable->get_tree_c1_prime()->open_iterator(t);
         } else {
diff --git a/memTreeComponent.cpp b/memTreeComponent.cpp
index 884f04e..ad847cb 100644
--- a/memTreeComponent.cpp
+++ b/memTreeComponent.cpp
@@ -3,8 +3,8 @@
 
 void memTreeComponent::tearDownTree(rbtree_ptr_t tree) {
     datatuple * t = 0;
-    typename rbtree_t::iterator old;
-    for(typename rbtree_t::iterator delitr  = tree->begin();
+    rbtree_t::iterator old;
+    for(rbtree_t::iterator delitr  = tree->begin();
                            delitr != tree->end();
                            delitr++) {
     	if(t) {
diff --git a/memTreeComponent.h b/memTreeComponent.h
index 336671a..cab64c0 100644
--- a/memTreeComponent.h
+++ b/memTreeComponent.h
@@ -20,7 +20,7 @@ public:
   class iterator
   {
   private:
-    typedef typename rbtree_t::const_iterator MTITER;
+    typedef rbtree_t::const_iterator MTITER;
 
   public:
     iterator( rbtree_t *s )
@@ -84,7 +84,7 @@ public:
   class revalidatingIterator
   {
   private:
-    typedef typename rbtree_t::const_iterator MTITER;
+    typedef rbtree_t::const_iterator MTITER;
 
   public:
     revalidatingIterator( rbtree_t *s, pthread_mutex_t * rb_mut ) : s_(s), mut_(rb_mut) {
@@ -153,7 +153,7 @@ public:
   class batchedRevalidatingIterator
   {
   private:
-    typedef typename rbtree_t::const_iterator MTITER;
+    typedef rbtree_t::const_iterator MTITER;
 
 
     void populate_next_ret_impl(std::_Rb_tree_const_iterator<datatuple*>/*MTITER*/ it) {