Instead of searching for machines in nodes we keep track of instances so it is faster to remove them. issue #1235