Remove binaries
Some fixes