some cleanup
removed jni experiment stuff