Removing binaries + some other minor fixes