Remove some unused dependencies
Fix errors on Windows