class deletion, refactor class serialization