Serializer, and cleanup of some fields