removing the machine specific references