Add class
Revert "Add class"

This reverts commit fdf96a8cf156e87be7954b0cfe64065c49010fcb.