Cleanup weird things

- Removed System.out.println()
- Some javadocs cleanups
My wrong, used for -Xdebug and class matches, will revert.