Remove circuits

Pending discussion and review. Seems like a major improvement already.
Here you have another lambda in which state has a different name but is the same thing. I suggest we just use it here.