Remove circuits

Pending discussion and review. Seems like a major improvement already.
I have a suspicion that these tokens can be implemented in a simpler way.