cleaning up after disable or uninstall, fixed #1