Updates to remove node from controller on shutdown