General cleanup

Still waiting for JNativeHook support