class cleanup
Merge commit 'b933dab60325dba8e3ac8271bba12e0069b57190'