Revert "Class changes"

This reverts commit 903fb9c2947efb50787c939847f74922fb0c351f.