Remove machine specific code