Cleanup weird things

- Removed System.out.println()
- Some javadocs cleanups
Fix upstream javadoc? :)