Revert "Object Class"

This reverts commit 8716bebf4258e3d84dac7d8bb81fe838e87b9f74.