Removed more unneeded packet handlings