cleanup opts useage in serializers