Remove circuits

Pending discussion and review. Seems like a major improvement already.
This seems like it would be clearer if it were simply inline because...