Added cleanup back to remove build servers