The remove method in the circuit class now works, with a small bug (see notes in setup_test_circuit). Hopefully we can crush this. Soon.