rebuild without broken uninstall macro