Name new CircuitBuilder and remove unused ones

Created by: pastly

I'm might be adding a new CircuitBuilder that will stick around past the end of the switch to HTTP.

• If it doesn't have a good name by then, find one.
• Remove unused CircuitBuilders