Remove unused utils and add some Java Docs