removing local serializers, fixing some kinks