Revert "class"

This reverts commit 1480f0929b7b3a72405c7e141c1741dd2d6d1dca.