Revert "Class"

This reverts commit db20eaae65e9f61c1f693ba858944e6270ff2a16.