more serializer cleanup