Remove all old code; fixed Set remove; fixed disconnect bug; fixed term reference.