Tidy conditionals
Remove OSX TODOs