Cleaning up code for connectors

Still missing the same connector in the graph