Drop lots of os defines