Merge "[lib] Add uninstall/cleanup option"