diff --git a/README.md b/README.md
index ccbb78261..643b6ef46 100644
--- a/README.md
+++ b/README.md
@@ -7,6 +7,6 @@ To Do
 -----
 * Gradle
 * Widgets
-* Remove dead code
+* Remove dead code, old branches
 * Remove unused resources and preferences
 * Fix warnings
diff --git a/actionbarsherlock/library/ActionBarSherlock.iml b/actionbarsherlock/library/ActionBarSherlock.iml
index 5074408f2..7b14baed5 100644
--- a/actionbarsherlock/library/ActionBarSherlock.iml
+++ b/actionbarsherlock/library/ActionBarSherlock.iml
@@ -4,6 +4,7 @@
     <facet type="android" name="Android">
       <configuration>
         <option name="LIBRARY_PROJECT" value="true" />
+        <option name="UPDATE_PROPERTY_FILES" value="true" />
       </configuration>
     </facet>
   </component>
diff --git a/actionbarsherlock/library/project.properties b/actionbarsherlock/library/project.properties
index 5ca7d6247..0e58ae1c0 100755
--- a/actionbarsherlock/library/project.properties
+++ b/actionbarsherlock/library/project.properties
@@ -9,4 +9,4 @@
 
 android.library=true
 # Project target.
-target=android-14
+target=android-17
diff --git a/android-aac-enc/android-aac-enc.iml b/android-aac-enc/android-aac-enc.iml
index 5a731f9ea..9ef3aece7 100644
--- a/android-aac-enc/android-aac-enc.iml
+++ b/android-aac-enc/android-aac-enc.iml
@@ -4,6 +4,7 @@
     <facet type="android" name="Android">
       <configuration>
         <option name="LIBRARY_PROJECT" value="true" />
+        <option name="UPDATE_PROPERTY_FILES" value="true" />
       </configuration>
     </facet>
   </component>
diff --git a/android-aac-enc/project.properties b/android-aac-enc/project.properties
index d52557723..e61077f79 100644
--- a/android-aac-enc/project.properties
+++ b/android-aac-enc/project.properties
@@ -8,5 +8,5 @@
 # project structure.
 
 # Project target.
-target=android-14
+target=android-17
 android.library=true
diff --git a/api/api.iml b/api/api.iml
index 5a731f9ea..9ef3aece7 100644
--- a/api/api.iml
+++ b/api/api.iml
@@ -4,6 +4,7 @@
     <facet type="android" name="Android">
       <configuration>
         <option name="LIBRARY_PROJECT" value="true" />
+        <option name="UPDATE_PROPERTY_FILES" value="true" />
       </configuration>
     </facet>
   </component>
diff --git a/api/project.properties b/api/project.properties
index 5ca7d6247..0e58ae1c0 100644
--- a/api/project.properties
+++ b/api/project.properties
@@ -9,4 +9,4 @@
 
 android.library=true
 # Project target.
-target=android-14
+target=android-17
diff --git a/astrid/astrid.iml b/astrid/astrid.iml
index b798789fc..0f4cb1d07 100644
--- a/astrid/astrid.iml
+++ b/astrid/astrid.iml
@@ -2,7 +2,9 @@
 <module type="JAVA_MODULE" version="4">
   <component name="FacetManager">
     <facet type="android" name="Android">
-      <configuration />
+      <configuration>
+        <option name="UPDATE_PROPERTY_FILES" value="true" />
+      </configuration>
     </facet>
   </component>
   <component name="NewModuleRootManager" inherit-compiler-output="true">
diff --git a/astrid/project.properties b/astrid/project.properties
index 2e83c80e4..c4d690454 100644
--- a/astrid/project.properties
+++ b/astrid/project.properties
@@ -9,11 +9,11 @@
 
 # Indicates whether an apk should be generated for each density.
 split.density=false
-android.library.reference.1=../api/
-android.library.reference.2=../actionbarsherlock/library
 # Project target.
-target=Google Inc.:Google APIs:14
+target=android-17
 apk-configurations=
-android.library.reference.3=../viewPagerIndicator/library
-android.library.reference.4=../greendroid/GreenDroid
+android.library.reference.1=../greendroid/GreenDroid
+android.library.reference.2=../viewPagerIndicator/library
+android.library.reference.3=../actionbarsherlock/library
+android.library.reference.4=../api
 android.library.reference.5=../android-aac-enc
diff --git a/greendroid/GreenDroid/GreenDroid.iml b/greendroid/GreenDroid/GreenDroid.iml
index c5c53486d..d87a65421 100644
--- a/greendroid/GreenDroid/GreenDroid.iml
+++ b/greendroid/GreenDroid/GreenDroid.iml
@@ -4,6 +4,7 @@
     <facet type="android" name="Android">
       <configuration>
         <option name="LIBRARY_PROJECT" value="true" />
+        <option name="UPDATE_PROPERTY_FILES" value="true" />
       </configuration>
     </facet>
   </component>
diff --git a/greendroid/GreenDroid/project.properties b/greendroid/GreenDroid/project.properties
index 44c20ddc8..0e8fa5dd4 100644
--- a/greendroid/GreenDroid/project.properties
+++ b/greendroid/GreenDroid/project.properties
@@ -11,5 +11,5 @@ android.library=true
 # Indicates whether an apk should be generated for each density.
 split.density=false
 # Project target.
-target=android-14
+target=android-17
 android.library.reference.1=../../actionbarsherlock/library
diff --git a/tests-sync/project.properties b/tests-sync/project.properties
index 730e911f2..98e627c3d 100644
--- a/tests-sync/project.properties
+++ b/tests-sync/project.properties
@@ -8,4 +8,5 @@
 # project structure.
 
 # Project target.
-target=android-14
+target=android-17
+android.library.reference.1=../api
diff --git a/tests-sync/tests-sync.iml b/tests-sync/tests-sync.iml
index 41e87c636..c65dd4b5a 100644
--- a/tests-sync/tests-sync.iml
+++ b/tests-sync/tests-sync.iml
@@ -2,7 +2,9 @@
 <module type="JAVA_MODULE" version="4">
   <component name="FacetManager">
     <facet type="android" name="Android">
-      <configuration />
+      <configuration>
+        <option name="UPDATE_PROPERTY_FILES" value="true" />
+      </configuration>
     </facet>
   </component>
   <component name="NewModuleRootManager" inherit-compiler-output="true">
diff --git a/tests/project.properties b/tests/project.properties
index 730e911f2..98e627c3d 100644
--- a/tests/project.properties
+++ b/tests/project.properties
@@ -8,4 +8,5 @@
 # project structure.
 
 # Project target.
-target=android-14
+target=android-17
+android.library.reference.1=../api
diff --git a/tests/tests.iml b/tests/tests.iml
index 0a263a59a..a0b8ce6fc 100644
--- a/tests/tests.iml
+++ b/tests/tests.iml
@@ -2,7 +2,9 @@
 <module type="JAVA_MODULE" version="4">
   <component name="FacetManager">
     <facet type="android" name="Android">
-      <configuration />
+      <configuration>
+        <option name="UPDATE_PROPERTY_FILES" value="true" />
+      </configuration>
     </facet>
   </component>
   <component name="NewModuleRootManager" inherit-compiler-output="true">
diff --git a/viewPagerIndicator/library/ViewPagerIndicator.iml b/viewPagerIndicator/library/ViewPagerIndicator.iml
index 85bcf3fa3..ddff95336 100644
--- a/viewPagerIndicator/library/ViewPagerIndicator.iml
+++ b/viewPagerIndicator/library/ViewPagerIndicator.iml
@@ -4,6 +4,7 @@
     <facet type="android" name="Android">
       <configuration>
         <option name="LIBRARY_PROJECT" value="true" />
+        <option name="UPDATE_PROPERTY_FILES" value="true" />
       </configuration>
     </facet>
   </component>
diff --git a/viewPagerIndicator/library/project.properties b/viewPagerIndicator/library/project.properties
index d90041233..2539b0519 100755
--- a/viewPagerIndicator/library/project.properties
+++ b/viewPagerIndicator/library/project.properties
@@ -9,5 +9,5 @@
 
 android.library=true
 # Project target.
-target=android-14
+target=android-17
 android.library.reference.1=../../actionbarsherlock/library