Improxing remove script and fixing the "pseudo-fix" of the build script.