Cleaning up the SimpleNode connection code