continue impl of ClassMixin, cleanup