Remove packet layout stuff