Removed the unnecessary unpack function