diff --git a/astrid/.classpath b/astrid/.classpath
index bc93784a6..11601c187 100644
--- a/astrid/.classpath
+++ b/astrid/.classpath
@@ -15,7 +15,6 @@
 	<classpathentry exported="true" kind="lib" path="libs/framework.jar"/>
 	<classpathentry exported="true" kind="lib" path="libs/httpmime-4.1.1.jar"/>
 	<classpathentry exported="true" kind="lib" path="libs/rfc2445-4Mar2011.jar"/>
-	<classpathentry exported="true" kind="lib" path="libs/guava-r09.jar"/>
 	<classpathentry exported="true" kind="lib" path="libs/jackson-core-asl-1.6.7.jar"/>
 	<classpathentry exported="true" kind="lib" path="libs/google-api-client-1.5.0-beta.jar"/>
 	<classpathentry exported="true" kind="lib" path="libs/google-api-client-extensions-1.5.0-beta.jar"/>
diff --git a/astrid/build.xml b/astrid/build.xml
index 3cdedd7e3..fb47786e4 100644
--- a/astrid/build.xml
+++ b/astrid/build.xml
@@ -142,10 +142,10 @@
                      replace="\1 true;" />
     </target>
 
-    <target name="obfuscate" depends="-setup">
-      <property name="proguard.enabled" value="true" />
-      <antcall target="-obfuscate" />      
-    </target>
+    <target name="obfuscate" depends="-set-debug-files, -set-debug-mode, nodeps, -build-setup, 
+                                      -set-release-mode, -release-obfuscation-check, -obfuscate" />
+
+    <target name="dex" depends="obfuscate, -dex" />
 
     <!-- build custom release package with updated version name -->
     <target name="release-custom">
diff --git a/astrid/libs/guava-r09.jar b/astrid/libs/guava-r09.jar
deleted file mode 100644
index 30dbc5692..000000000
Binary files a/astrid/libs/guava-r09.jar and /dev/null differ
diff --git a/astrid/proguard.cfg b/astrid/proguard.cfg
index 0c7ac57b7..142e82af5 100644
--- a/astrid/proguard.cfg
+++ b/astrid/proguard.cfg
@@ -1,16 +1,14 @@
--optimizationpasses 5
+-optimizationpasses 2
 -dontusemixedcaseclassnames
 -dontskipnonpubliclibraryclasses
 -dontpreverify
 -verbose
+-optimizations !code/simplification/arithmetic,!field/*,!class/merging/*,!code/allocation/variable
 
 # astrid-specific
 -dontobfuscate
--dontoptimize
 -keepattributes SourceFile, SourceDir, LineNumberTable, LocalVariableTable, LocalVariableTypeTable
--keep class com.todoroo.**
--keep class com.mdimension.**
--keepnames class com.google.**
+-keep, allowshrinking, allowoptimization class com.todoroo.**
 
 # ignore reflection-based access from google libraries
 -dontwarn com.google.**
@@ -25,10 +23,6 @@
 -keep public class * extends android.app.backup.BackupAgentHelper
 -keep public class * extends android.preference.Preference
 
--keepclasseswithmembernames class * {
-    native <methods>;
-}
-
 -keepclasseswithmembers class * {
     public <init>(android.content.Context, android.util.AttributeSet);
 }