A bit more removal of the previous attempt-to-migrate-to-Netty code.