Remove circuits

Pending discussion and review. Seems like a major improvement already.