Some documentation and removal of dead code
Merge branch 'netty4series'