Removed custom serializer