Cleaning serializer and utils