Merge "Remove class serialization"