diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..a22392a
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,2 @@
+/bin
+/gen
diff --git a/bin/AndroidManifest.xml b/bin/AndroidManifest.xml
deleted file mode 100644
index bf6f7c7..0000000
--- a/bin/AndroidManifest.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?> 
-<manifest xmlns:android='http://schemas.android.com/apk/res/android' package='org.rubototest.multiact' android:versionCode='1' android:versionName='1.0'>
-    <application android:label='@string/app_name' android:icon='@drawable/ic_launcher' android:hardwareAccelerated='true' android:largeHeap='true'>
-        <activity android:name='MultiactActivity' android:label='@string/app_name'>
-            <intent-filter>
-                <action android:name='android.intent.action.MAIN'/>
-                <category android:name='android.intent.category.LAUNCHER'/>
-            </intent-filter>
-        </activity>
-        <activity android:name='org.ruboto.RubotoActivity' android:exported='false'/>
-        <activity android:name='org.ruboto.RubotoDialog' android:exported='false' android:theme='@android:style/Theme.Dialog'/>
-        <service android:name='org.ruboto.RubotoService' android:exported='false'/>
-    </application>
-    <uses-sdk android:minSdkVersion='16' android:targetSdkVersion='16'/>
-</manifest>
\ No newline at end of file
diff --git a/bin/AndroidManifest.xml.d b/bin/AndroidManifest.xml.d
deleted file mode 100644
index 9168be0..0000000
--- a/bin/AndroidManifest.xml.d
+++ /dev/null
@@ -1,2 +0,0 @@
-/media/storage/home/jeremy/recent_projects/multiact/bin/AndroidManifest.xml : \
-/media/storage/home/jeremy/recent_projects/multiact/AndroidManifest.xml \
diff --git a/bin/Multiact-debug-unaligned.apk b/bin/Multiact-debug-unaligned.apk
deleted file mode 100644
index bd9955d..0000000
Binary files a/bin/Multiact-debug-unaligned.apk and /dev/null differ
diff --git a/bin/Multiact-debug-unaligned.apk.d b/bin/Multiact-debug-unaligned.apk.d
deleted file mode 100644
index 6307574..0000000
--- a/bin/Multiact-debug-unaligned.apk.d
+++ /dev/null
@@ -1,21 +0,0 @@
-/media/storage/home/jeremy/recent_projects/multiact/bin/Multiact-debug-unaligned.apk : \
-/media/storage/home/jeremy/recent_projects/multiact/bin/Multiact.ap_ \
-/media/storage/home/jeremy/recent_projects/multiact/bin/classes.dex \
-/media/storage/home/jeremy/recent_projects/multiact/src/ruboto/version.rb \
-/media/storage/home/jeremy/recent_projects/multiact/src/ruboto/preference.rb \
-/media/storage/home/jeremy/recent_projects/multiact/src/ruboto/package.rb \
-/media/storage/home/jeremy/recent_projects/multiact/src/ruboto/menu.rb \
-/media/storage/home/jeremy/recent_projects/multiact/src/ruboto/legacy.rb \
-/media/storage/home/jeremy/recent_projects/multiact/src/ruboto/util/toast.rb \
-/media/storage/home/jeremy/recent_projects/multiact/src/ruboto/util/stack.rb \
-/media/storage/home/jeremy/recent_projects/multiact/src/ruboto/activity.rb \
-/media/storage/home/jeremy/recent_projects/multiact/src/ruboto/base.rb \
-/media/storage/home/jeremy/recent_projects/multiact/src/ruboto/broadcast_receiver.rb \
-/media/storage/home/jeremy/recent_projects/multiact/src/ruboto/generate.rb \
-/media/storage/home/jeremy/recent_projects/multiact/src/ruboto/service.rb \
-/media/storage/home/jeremy/recent_projects/multiact/src/ruboto/widget.rb \
-/media/storage/home/jeremy/recent_projects/multiact/src/multiact_activity.rb \
-/media/storage/home/jeremy/recent_projects/multiact/src/ruboto.rb \
-/media/storage/home/jeremy/recent_projects/multiact/libs/jruby-core-1.7.0.preview2.dev.jar \
-/media/storage/home/jeremy/recent_projects/multiact/libs/dexmaker20120305.jar \
-/media/storage/home/jeremy/recent_projects/multiact/libs/jruby-stdlib-1.7.0.preview2.dev.jar \
diff --git a/bin/Multiact-debug.apk b/bin/Multiact-debug.apk
deleted file mode 100644
index 8fef672..0000000
Binary files a/bin/Multiact-debug.apk and /dev/null differ
diff --git a/bin/Multiact.ap_ b/bin/Multiact.ap_
deleted file mode 100644
index 1acbcc2..0000000
Binary files a/bin/Multiact.ap_ and /dev/null differ
diff --git a/bin/Multiact.ap_.d b/bin/Multiact.ap_.d
deleted file mode 100644
index dbef6aa..0000000
--- a/bin/Multiact.ap_.d
+++ /dev/null
@@ -1,14 +0,0 @@
-/media/storage/home/jeremy/recent_projects/multiact/bin/Multiact.ap_ \
- : /media/storage/home/jeremy/recent_projects/multiact/res/values/strings.xml \
-/media/storage/home/jeremy/recent_projects/multiact/res/layout/get_ruboto_core.xml \
-/media/storage/home/jeremy/recent_projects/multiact/res/drawable-xhdpi/ic_launcher.png \
-/media/storage/home/jeremy/recent_projects/multiact/res/drawable-hdpi/ic_launcher.png \
-/media/storage/home/jeremy/recent_projects/multiact/res/drawable-mdpi/ic_launcher.png \
-/media/storage/home/jeremy/recent_projects/multiact/res/drawable-ldpi/ic_launcher.png \
-/media/storage/home/jeremy/recent_projects/multiact/res/drawable/get_ruboto_core.png \
-/media/storage/home/jeremy/recent_projects/multiact/bin/res/drawable-hdpi/ic_launcher.png \
-/media/storage/home/jeremy/recent_projects/multiact/bin/res/drawable-ldpi/ic_launcher.png \
-/media/storage/home/jeremy/recent_projects/multiact/bin/res/drawable-mdpi/ic_launcher.png \
-/media/storage/home/jeremy/recent_projects/multiact/bin/res/drawable-xhdpi/ic_launcher.png \
-/media/storage/home/jeremy/recent_projects/multiact/bin/res/drawable/get_ruboto_core.png \
-/media/storage/home/jeremy/recent_projects/multiact/bin/AndroidManifest.xml \
diff --git a/bin/build.prop b/bin/build.prop
deleted file mode 100644
index 1af905c..0000000
--- a/bin/build.prop
+++ /dev/null
@@ -1,10 +0,0 @@
-#Last build type
-#Thu, 02 Aug 2012 22:38:26 -0700
-
-build.last.target=debug
-
-build.last.is.instrumented=false
-
-build.last.is.packaging.debug=true
-
-build.last.is.signing.debug=true
diff --git a/bin/classes.dex b/bin/classes.dex
deleted file mode 100644
index 17e6df4..0000000
Binary files a/bin/classes.dex and /dev/null differ
diff --git a/bin/classes.dex.d b/bin/classes.dex.d
deleted file mode 100644
index fa320c7..0000000
--- a/bin/classes.dex.d
+++ /dev/null
@@ -1,25 +0,0 @@
-/media/storage/home/jeremy/recent_projects/multiact/bin/classes.dex : \
-/media/storage/home/jeremy/recent_projects/multiact/bin/classes/org/ruboto/EntryPointActivity$1.class \
-/media/storage/home/jeremy/recent_projects/multiact/bin/classes/org/ruboto/EntryPointActivity$2$1.class \
-/media/storage/home/jeremy/recent_projects/multiact/bin/classes/org/ruboto/EntryPointActivity$2$2.class \
-/media/storage/home/jeremy/recent_projects/multiact/bin/classes/org/ruboto/EntryPointActivity$2.class \
-/media/storage/home/jeremy/recent_projects/multiact/bin/classes/org/ruboto/EntryPointActivity$3.class \
-/media/storage/home/jeremy/recent_projects/multiact/bin/classes/org/ruboto/EntryPointActivity.class \
-/media/storage/home/jeremy/recent_projects/multiact/bin/classes/org/ruboto/RubotoActivity.class \
-/media/storage/home/jeremy/recent_projects/multiact/bin/classes/org/ruboto/JRubyAdapter.class \
-/media/storage/home/jeremy/recent_projects/multiact/bin/classes/org/ruboto/Log.class \
-/media/storage/home/jeremy/recent_projects/multiact/bin/classes/org/ruboto/RubotoBroadcastReceiver.class \
-/media/storage/home/jeremy/recent_projects/multiact/bin/classes/org/ruboto/RubotoDialog.class \
-/media/storage/home/jeremy/recent_projects/multiact/bin/classes/org/ruboto/RubotoService.class \
-/media/storage/home/jeremy/recent_projects/multiact/bin/classes/org/ruboto/Script.class \
-/media/storage/home/jeremy/recent_projects/multiact/bin/classes/org/rubototest/multiact/MultiactActivity.class \
-/media/storage/home/jeremy/recent_projects/multiact/bin/classes/org/rubototest/multiact/BuildConfig.class \
-/media/storage/home/jeremy/recent_projects/multiact/bin/classes/org/rubototest/multiact/R$attr.class \
-/media/storage/home/jeremy/recent_projects/multiact/bin/classes/org/rubototest/multiact/R$drawable.class \
-/media/storage/home/jeremy/recent_projects/multiact/bin/classes/org/rubototest/multiact/R$id.class \
-/media/storage/home/jeremy/recent_projects/multiact/bin/classes/org/rubototest/multiact/R$layout.class \
-/media/storage/home/jeremy/recent_projects/multiact/bin/classes/org/rubototest/multiact/R$string.class \
-/media/storage/home/jeremy/recent_projects/multiact/bin/classes/org/rubototest/multiact/R.class \
-/media/storage/home/jeremy/recent_projects/multiact/libs/jruby-core-1.7.0.preview2.dev.jar \
-/media/storage/home/jeremy/recent_projects/multiact/libs/dexmaker20120305.jar \
-/media/storage/home/jeremy/recent_projects/multiact/libs/jruby-stdlib-1.7.0.preview2.dev.jar \
diff --git a/bin/classes/org/ruboto/EntryPointActivity$1.class b/bin/classes/org/ruboto/EntryPointActivity$1.class
deleted file mode 100644
index f4da877..0000000
Binary files a/bin/classes/org/ruboto/EntryPointActivity$1.class and /dev/null differ
diff --git a/bin/classes/org/ruboto/EntryPointActivity$2$1.class b/bin/classes/org/ruboto/EntryPointActivity$2$1.class
deleted file mode 100644
index b65e76b..0000000
Binary files a/bin/classes/org/ruboto/EntryPointActivity$2$1.class and /dev/null differ
diff --git a/bin/classes/org/ruboto/EntryPointActivity$2$2.class b/bin/classes/org/ruboto/EntryPointActivity$2$2.class
deleted file mode 100644
index 88802fe..0000000
Binary files a/bin/classes/org/ruboto/EntryPointActivity$2$2.class and /dev/null differ
diff --git a/bin/classes/org/ruboto/EntryPointActivity$2.class b/bin/classes/org/ruboto/EntryPointActivity$2.class
deleted file mode 100644
index 0c03f96..0000000
Binary files a/bin/classes/org/ruboto/EntryPointActivity$2.class and /dev/null differ
diff --git a/bin/classes/org/ruboto/EntryPointActivity$3.class b/bin/classes/org/ruboto/EntryPointActivity$3.class
deleted file mode 100644
index 38e45b8..0000000
Binary files a/bin/classes/org/ruboto/EntryPointActivity$3.class and /dev/null differ
diff --git a/bin/classes/org/ruboto/EntryPointActivity.class b/bin/classes/org/ruboto/EntryPointActivity.class
deleted file mode 100644
index 46ddf44..0000000
Binary files a/bin/classes/org/ruboto/EntryPointActivity.class and /dev/null differ
diff --git a/bin/classes/org/ruboto/JRubyAdapter.class b/bin/classes/org/ruboto/JRubyAdapter.class
deleted file mode 100644
index 02ffbae..0000000
Binary files a/bin/classes/org/ruboto/JRubyAdapter.class and /dev/null differ
diff --git a/bin/classes/org/ruboto/Log.class b/bin/classes/org/ruboto/Log.class
deleted file mode 100644
index 6437be2..0000000
Binary files a/bin/classes/org/ruboto/Log.class and /dev/null differ
diff --git a/bin/classes/org/ruboto/RubotoActivity.class b/bin/classes/org/ruboto/RubotoActivity.class
deleted file mode 100644
index 48ac7a5..0000000
Binary files a/bin/classes/org/ruboto/RubotoActivity.class and /dev/null differ
diff --git a/bin/classes/org/ruboto/RubotoBroadcastReceiver.class b/bin/classes/org/ruboto/RubotoBroadcastReceiver.class
deleted file mode 100644
index d75e6af..0000000
Binary files a/bin/classes/org/ruboto/RubotoBroadcastReceiver.class and /dev/null differ
diff --git a/bin/classes/org/ruboto/RubotoDialog.class b/bin/classes/org/ruboto/RubotoDialog.class
deleted file mode 100644
index 294404f..0000000
Binary files a/bin/classes/org/ruboto/RubotoDialog.class and /dev/null differ
diff --git a/bin/classes/org/ruboto/RubotoService.class b/bin/classes/org/ruboto/RubotoService.class
deleted file mode 100644
index 6c0191b..0000000
Binary files a/bin/classes/org/ruboto/RubotoService.class and /dev/null differ
diff --git a/bin/classes/org/ruboto/Script.class b/bin/classes/org/ruboto/Script.class
deleted file mode 100644
index 5b7b220..0000000
Binary files a/bin/classes/org/ruboto/Script.class and /dev/null differ
diff --git a/bin/classes/org/rubototest/multiact/BuildConfig.class b/bin/classes/org/rubototest/multiact/BuildConfig.class
deleted file mode 100644
index 7a5d7b7..0000000
Binary files a/bin/classes/org/rubototest/multiact/BuildConfig.class and /dev/null differ
diff --git a/bin/classes/org/rubototest/multiact/MultiactActivity.class b/bin/classes/org/rubototest/multiact/MultiactActivity.class
deleted file mode 100644
index f18a9a1..0000000
Binary files a/bin/classes/org/rubototest/multiact/MultiactActivity.class and /dev/null differ
diff --git a/bin/classes/org/rubototest/multiact/R$attr.class b/bin/classes/org/rubototest/multiact/R$attr.class
deleted file mode 100644
index aa7d9a7..0000000
Binary files a/bin/classes/org/rubototest/multiact/R$attr.class and /dev/null differ
diff --git a/bin/classes/org/rubototest/multiact/R$drawable.class b/bin/classes/org/rubototest/multiact/R$drawable.class
deleted file mode 100644
index 1bc579c..0000000
Binary files a/bin/classes/org/rubototest/multiact/R$drawable.class and /dev/null differ
diff --git a/bin/classes/org/rubototest/multiact/R$id.class b/bin/classes/org/rubototest/multiact/R$id.class
deleted file mode 100644
index 34ff2e8..0000000
Binary files a/bin/classes/org/rubototest/multiact/R$id.class and /dev/null differ
diff --git a/bin/classes/org/rubototest/multiact/R$layout.class b/bin/classes/org/rubototest/multiact/R$layout.class
deleted file mode 100644
index 522e6bf..0000000
Binary files a/bin/classes/org/rubototest/multiact/R$layout.class and /dev/null differ
diff --git a/bin/classes/org/rubototest/multiact/R$string.class b/bin/classes/org/rubototest/multiact/R$string.class
deleted file mode 100644
index c77e7c1..0000000
Binary files a/bin/classes/org/rubototest/multiact/R$string.class and /dev/null differ
diff --git a/bin/classes/org/rubototest/multiact/R.class b/bin/classes/org/rubototest/multiact/R.class
deleted file mode 100644
index 4bed9ec..0000000
Binary files a/bin/classes/org/rubototest/multiact/R.class and /dev/null differ
diff --git a/bin/jarlist.cache b/bin/jarlist.cache
deleted file mode 100644
index 1b5ec3f..0000000
--- a/bin/jarlist.cache
+++ /dev/null
@@ -1,3 +0,0 @@
-# cache for current jar dependecy. DO NOT EDIT.
-# format is <lastModified> <length> <SHA-1> <path>
-# Encoding is UTF-8
diff --git a/bin/proguard.txt b/bin/proguard.txt
deleted file mode 100644
index b733585..0000000
--- a/bin/proguard.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-# view AndroidManifest.xml #generated:10
--keep class org.ruboto.RubotoActivity { <init>(...); }
-
-# view AndroidManifest.xml #generated:11
--keep class org.ruboto.RubotoDialog { <init>(...); }
-
-# view AndroidManifest.xml #generated:12
--keep class org.ruboto.RubotoService { <init>(...); }
-
-# view AndroidManifest.xml #generated:4
--keep class org.rubototest.multiact.MultiactActivity { <init>(...); }
-
-# onClick res/layout/get_ruboto_core.xml #generated:9
--keepclassmembers class * { *** getRubotoCore(...); }
-
diff --git a/bin/res/drawable-hdpi/ic_launcher.png b/bin/res/drawable-hdpi/ic_launcher.png
deleted file mode 100644
index 61aeba1..0000000
Binary files a/bin/res/drawable-hdpi/ic_launcher.png and /dev/null differ
diff --git a/bin/res/drawable-ldpi/ic_launcher.png b/bin/res/drawable-ldpi/ic_launcher.png
deleted file mode 100644
index 14635c0..0000000
Binary files a/bin/res/drawable-ldpi/ic_launcher.png and /dev/null differ
diff --git a/bin/res/drawable-mdpi/ic_launcher.png b/bin/res/drawable-mdpi/ic_launcher.png
deleted file mode 100644
index 662b4e6..0000000
Binary files a/bin/res/drawable-mdpi/ic_launcher.png and /dev/null differ
diff --git a/bin/res/drawable-xhdpi/ic_launcher.png b/bin/res/drawable-xhdpi/ic_launcher.png
deleted file mode 100644
index 916901e..0000000
Binary files a/bin/res/drawable-xhdpi/ic_launcher.png and /dev/null differ
diff --git a/bin/res/drawable/get_ruboto_core.png b/bin/res/drawable/get_ruboto_core.png
deleted file mode 100644
index 03a1f97..0000000
Binary files a/bin/res/drawable/get_ruboto_core.png and /dev/null differ
diff --git a/gen/R.java.d b/gen/R.java.d
deleted file mode 100644
index a2bb033..0000000
--- a/gen/R.java.d
+++ /dev/null
@@ -1,9 +0,0 @@
-/media/storage/home/jeremy/recent_projects/multiact/gen/org/rubototest/multiact/R.java \
- : /media/storage/home/jeremy/recent_projects/multiact/res/values/strings.xml \
-/media/storage/home/jeremy/recent_projects/multiact/res/layout/get_ruboto_core.xml \
-/media/storage/home/jeremy/recent_projects/multiact/res/drawable-xhdpi/ic_launcher.png \
-/media/storage/home/jeremy/recent_projects/multiact/res/drawable-hdpi/ic_launcher.png \
-/media/storage/home/jeremy/recent_projects/multiact/res/drawable-mdpi/ic_launcher.png \
-/media/storage/home/jeremy/recent_projects/multiact/res/drawable-ldpi/ic_launcher.png \
-/media/storage/home/jeremy/recent_projects/multiact/res/drawable/get_ruboto_core.png \
-/media/storage/home/jeremy/recent_projects/multiact/bin/AndroidManifest.xml \
diff --git a/gen/org/rubototest/multiact/BuildConfig.java b/gen/org/rubototest/multiact/BuildConfig.java
deleted file mode 100644
index b121240..0000000
--- a/gen/org/rubototest/multiact/BuildConfig.java
+++ /dev/null
@@ -1,6 +0,0 @@
-/** Automatically generated file. DO NOT MODIFY */
-package org.rubototest.multiact;
-
-public final class BuildConfig {
-    public final static boolean DEBUG = true;
-}
\ No newline at end of file
diff --git a/gen/org/rubototest/multiact/R.java b/gen/org/rubototest/multiact/R.java
deleted file mode 100644
index 07e7fd4..0000000
--- a/gen/org/rubototest/multiact/R.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/* AUTO-GENERATED FILE.  DO NOT MODIFY.
- *
- * This class was automatically generated by the
- * aapt tool from the resource data it found.  It
- * should not be modified by hand.
- */
-
-package org.rubototest.multiact;
-
-public final class R {
-    public static final class attr {
-    }
-    public static final class drawable {
-        public static final int get_ruboto_core=0x7f020000;
-        public static final int ic_launcher=0x7f020001;
-    }
-    public static final class id {
-        public static final int image=0x7f050000;
-        public static final int text=0x7f050001;
-    }
-    public static final class layout {
-        public static final int get_ruboto_core=0x7f030000;
-    }
-    public static final class string {
-        public static final int app_name=0x7f040000;
-    }
-}
diff --git a/libs/jruby-core-1.7.0.preview2.dev.jar b/libs/jruby-core-1.7.0.preview2.dev.jar
deleted file mode 100644
index 13c58f4..0000000
Binary files a/libs/jruby-core-1.7.0.preview2.dev.jar and /dev/null differ
diff --git a/libs/jruby-core-1.7.0.preview2.jar b/libs/jruby-core-1.7.0.preview2.jar
index 6ca1d53..0c4dc21 100644
Binary files a/libs/jruby-core-1.7.0.preview2.jar and b/libs/jruby-core-1.7.0.preview2.jar differ
diff --git a/libs/jruby-stdlib-1.7.0.preview2.dev.jar b/libs/jruby-stdlib-1.7.0.preview2.dev.jar
deleted file mode 100644
index f6a27fd..0000000
Binary files a/libs/jruby-stdlib-1.7.0.preview2.dev.jar and /dev/null differ
diff --git a/libs/jruby-stdlib-1.7.0.preview2.jar b/libs/jruby-stdlib-1.7.0.preview2.jar
index 5b925d2..0556584 100644
Binary files a/libs/jruby-stdlib-1.7.0.preview2.jar and b/libs/jruby-stdlib-1.7.0.preview2.jar differ
diff --git a/src/multiact_activity.rb b/src/multiact_activity.rb
index d4bccdf..cef4f36 100644
--- a/src/multiact_activity.rb
+++ b/src/multiact_activity.rb
@@ -6,27 +6,23 @@
 
 # http://xkcd.com/378/
 
-class RubotoActivity
-  def self.main(context)
-    context.start_ruboto_activity("$activity_main") do
-      def on_create(bundle)
-        setTitle "main activity"
-        setContentView(
-          linear_layout(:orientation => :vertical) do
-            @text_view = text_view :text => 'What hath Matz wrought?', :id => 42, :width => :fill_parent,
+class MultiactActivity
+  def on_create(bundle)
+    setTitle "main activity"
+    setContentView(
+        linear_layout(:orientation => :vertical) do
+          @text_view = text_view :text => 'What hath Matz wrought?', :id => 42, :width => :fill_parent,
                                  :gravity => android.view.Gravity::CENTER, :text_size => 48.0
-            button :text => "Next activity", :id => 43, :width => :fill_parent, :on_click_listener => @on_click_next
-          end
-        )
-      end
-      @on_click_next = proc do |button|
-        RubotoActivity.next(self)
-      end
-    end
+          button :text => "Next activity", :id => 43, :width => :fill_parent, :on_click_listener => proc { next_activity ; nil }
+        end
+    )
   end
 
-  def self.next(context)
-    context.start_ruboto_activity("$activity_next") do
+  private
+
+  def next_activity
+    puts 'Start next activity'
+    start_ruboto_activity("$activity_next") do
       def on_create(bundle)
         setContentView(
           linear_layout(:orientation => :vertical) do
@@ -38,5 +34,3 @@ def on_create(bundle)
     end
   end
 end
-
-RubotoActivity.main $activity 
diff --git a/src/org/ruboto/JRubyAdapter.java b/src/org/ruboto/JRubyAdapter.java
index d3f1b28..547f105 100644
--- a/src/org/ruboto/JRubyAdapter.java
+++ b/src/org/ruboto/JRubyAdapter.java
@@ -400,12 +400,12 @@ private static void handleInitException(Exception e) {
 
     // FIXME(uwe):  Remove when we stop supporting JRuby < 1.7.0
     @Deprecated public static boolean isJRubyPreOneSeven() {
-        return ((String)get("JRUBY_VERSION")).equals("1.7.0.dev") || ((String)get("JRUBY_VERSION")).equals("1.6.7");
+        return ((String)get("JRUBY_VERSION")).equals("1.7.0.dev") || ((String)get("JRUBY_VERSION")).startsWith("1.6.");
     }
 
     // FIXME(uwe):  Remove when we stop supporting JRuby < 1.7.0
     @Deprecated public static boolean isJRubyOneSeven() {
-        return ((String)get("JRUBY_VERSION")).startsWith("1.7.");
+        return !isJRubyPreOneSeven() && ((String)get("JRUBY_VERSION")).startsWith("1.7.");
     }
 
     // FIXME(uwe):  Remove when we stop supporting Ruby 1.8
diff --git a/src/ruboto/activity.rb b/src/ruboto/activity.rb
index b79129a..b82ba3f 100644
--- a/src/ruboto/activity.rb
+++ b/src/ruboto/activity.rb
@@ -21,7 +21,7 @@ def initialize_ruboto()
 
       instance_eval &$context_init_block if $context_init_block
       $context_init_block = nil
-      setup_ruboto_callbacks 
+      setup_ruboto_callbacks
 
       @initialized = true
       self