Remove circuits

Pending discussion and review. Seems like a major improvement already.
This has turned out to be much nicer, let's avoid tuples for such things in future.