Cleanup various api resources

Took a trip through the java bindings, and cleaned up various api resources.