cleanup, refactoring + netty 4.0.21