Revert "Update class v5"

This reverts commit 4cb4db351464bad5d46239ef1362b714e6a006ef.