Cleanup and new packet handler system