removed more os-specific code