Remove polymorphic unpack stuff