Drop more os specific code