Removed Serializer obligation on some classes and updated affected
classes.