Revert "Revert "Remove Uninstall""

This reverts commit e6851972f305f3149075888e2f72220095931d6a.
Revert "Remove Uninstall"

This reverts commit a37b0759b7803de7422b6a9c568dbc6e4526b353.