Cleaned up the java bindings for final stage