Revert "Draw class modifications"

This reverts commit 5a751ecf227b4a1eef3c029c8388e1c3aa58dc85.