removed vestigial organs and fixed mingw build