Remove unneeded friendship
Make it work on windows