Revert "Simplifier structure"

This reverts commit e6f6a9a0db5c4a1ecfe779a1005e153ba4665fab.