Remove more dependancies that were shimmed in for windows