Remove unused Codec
Update netty to CR7
Remove unused variable
Remvoe unneeded TODO