Cleaned up java ops