More cleaning, while keeping the binary release.