Removed last traces of IMachine