Fix uninstall and cleanup when $enabled=false