Adds wait function and remove baremetal nodes