Revert "New class."

This reverts commit a2bc221f4d2e25e8b394278bf367729906a2e6e2.