Slight cleanup of Netty